[src/trunk]: src/sys/arch Go back to not always defining PAGE_{SIZE, SHIFT, MASK}

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2350d2a1b9eb
branches:  trunk
changeset: 449926:2350d2a1b9eb
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Mar 29 12:51:15 2019 +0000

description:
Go back to not always defining PAGE_{SIZE,SHIFT,MASK}

diffstat:

 sys/arch/powerpc/include/vmparam.h |   6 +-----
 sys/arch/sparc/include/vmparam.h   |  10 +++-------
 2 files changed, 4 insertions(+), 12 deletions(-)

diffs (48 lines):

diff -r b5f3296c6181 -r 2350d2a1b9eb sys/arch/powerpc/include/vmparam.h
--- a/sys/arch/powerpc/include/vmparam.h        Fri Mar 29 12:50:30 2019 +0000
+++ b/sys/arch/powerpc/include/vmparam.h        Fri Mar 29 12:51:15 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.21 2019/03/27 16:16:43 christos Exp $    */
+/*     $NetBSD: vmparam.h,v 1.22 2019/03/29 12:51:15 christos Exp $    */
 
 #ifndef _POWERPC_VMPARAM_H_
 #define _POWERPC_VMPARAM_H_
@@ -70,10 +70,6 @@
 #include <powerpc/oea/vmparam.h>
 #elif defined(_KERNEL)
 #error unknown PPC variant
-#else
-#define PAGE_SHIFT      MAX_PAGE_SHIFT
-#define PAGE_SIZE       (1 << PAGE_SHIFT)
-#define PAGE_MASK       (PAGE_SIZE - 1)
 #endif
 
 #endif /* !_MODULE */
diff -r b5f3296c6181 -r 2350d2a1b9eb sys/arch/sparc/include/vmparam.h
--- a/sys/arch/sparc/include/vmparam.h  Fri Mar 29 12:50:30 2019 +0000
+++ b/sys/arch/sparc/include/vmparam.h  Fri Mar 29 12:51:15 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.46 2019/03/29 00:08:13 christos Exp $ */
+/*     $NetBSD: vmparam.h,v 1.47 2019/03/29 12:51:15 christos Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -72,16 +72,12 @@
 #define        PAGE_SHIFT              PAGE_SHIFT_SUN4CM
 #elif CPU_NTYPES == 1 && defined(SUN4)
 #define        PAGE_SHIFT              PAGE_SHIFT_SUN4
-#elif defined(_KERNEL) && !defined(_RUMPKERNEL) \
-    && !defined(STANDALONE) && !defined(_MODULE)
-#error "Cannot determine page size"
-#else
-/* Default to max for userland */
-#define        PAGE_SHIFT              MAX_PAGE_SHIFT
 #endif
 
+#ifdef PAGE_SHIFT              PAGE_SHIFT_SUN4
 #define        PAGE_SIZE               (1 << PAGE_SHIFT)
 #define        PAGE_MASK               (PAGE_SIZE - 1)
+#endif
 
 /*
  * USRSTACK is the top (end) of the user stack.