Mon Jul 6 08:26:10 2020 UTC ()
Correct #ifdef; _MODULE not _MODULAR here.

Now __HAVE_PMAP_PHYSSEG is defined correctly for modules, which was
missing accidentally.


(rin)
diff -r1.23 -r1.24 src/sys/arch/powerpc/include/vmparam.h
cvs diff -r1.23 -r1.24 src/sys/arch/powerpc/include/vmparam.h (expand / switch to unified diff)

--- src/sys/arch/powerpc/include/vmparam.h 2020/06/27 02:51:23 1.23
+++ src/sys/arch/powerpc/include/vmparam.h 2020/07/06 08:26:10 1.24
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: vmparam.h,v 1.23 2020/06/27 02:51:23 rin Exp $ */ 1/* $NetBSD: vmparam.h,v 1.24 2020/07/06 08:26:10 rin Exp $ */
2 2
3#ifndef _POWERPC_VMPARAM_H_ 3#ifndef _POWERPC_VMPARAM_H_
4#define _POWERPC_VMPARAM_H_ 4#define _POWERPC_VMPARAM_H_
5 5
6#ifdef _KERNEL_OPT 6#ifdef _KERNEL_OPT
7#include "opt_modular.h" 7#include "opt_modular.h"
8#include "opt_ppcarch.h" 8#include "opt_ppcarch.h"
9#include "opt_uvm.h" 9#include "opt_uvm.h"
10#endif 10#endif
11 11
12/* 12/*
13 * These are common for BOOKE, IBM4XX, and OEA 13 * These are common for BOOKE, IBM4XX, and OEA
14 */ 14 */
@@ -67,27 +67,27 @@ extern const char __USRSTACK; /* let th @@ -67,27 +67,27 @@ extern const char __USRSTACK; /* let th
67 67
68#if defined(PPC_BOOKE) 68#if defined(PPC_BOOKE)
69#include <powerpc/booke/vmparam.h> 69#include <powerpc/booke/vmparam.h>
70#elif defined(PPC_IBM4XX) 70#elif defined(PPC_IBM4XX)
71#include <powerpc/ibm4xx/vmparam.h> 71#include <powerpc/ibm4xx/vmparam.h>
72#elif defined(PPC_OEA) || defined (PPC_OEA64) || defined (PPC_OEA64_BRIDGE) 72#elif defined(PPC_OEA) || defined (PPC_OEA64) || defined (PPC_OEA64_BRIDGE)
73#include <powerpc/oea/vmparam.h> 73#include <powerpc/oea/vmparam.h>
74#elif defined(_KERNEL) 74#elif defined(_KERNEL)
75#error unknown PPC variant 75#error unknown PPC variant
76#endif 76#endif
77 77
78#endif /* !_MODULE */ 78#endif /* !_MODULE */
79 79
80#if defined(MODULAR) || defined(_MODULAR) 80#if defined(MODULAR) || defined(_MODULE)
81/* 81/*
82 * If we are a module or support modules, we need to define a compatible 82 * If we are a module or support modules, we need to define a compatible
83 * pmap_physseg since IBM4XX uses one. This will waste a tiny of space 83 * pmap_physseg since IBM4XX uses one. This will waste a tiny of space
84 * but is needed for compatibility. 84 * but is needed for compatibility.
85 */ 85 */
86#ifndef __HAVE_PMAP_PHYSSEG 86#ifndef __HAVE_PMAP_PHYSSEG
87#define __HAVE_PMAP_PHYSSEG 87#define __HAVE_PMAP_PHYSSEG
88struct pmap_physseg { 88struct pmap_physseg {
89 uintptr_t pmseg_dummy[2]; 89 uintptr_t pmseg_dummy[2];
90}; 90};
91#endif 91#endif
92 92
93__CTASSERT(sizeof(struct pmap_physseg) == sizeof(uintptr_t) * 2); 93__CTASSERT(sizeof(struct pmap_physseg) == sizeof(uintptr_t) * 2);