Module Name: src
Committed By: christos
Date: Fri Mar 29 12:51:15 UTC 2019
Modified Files:
src/sys/arch/powerpc/include: vmparam.h
src/sys/arch/sparc/include: vmparam.h
Log Message:
Go back to not always defining PAGE_{SIZE,SHIFT,MASK}
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/powerpc/include/vmparam.h
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/sparc/include/vmparam.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/include/vmparam.h
diff -u src/sys/arch/powerpc/include/vmparam.h:1.21 src/sys/arch/powerpc/include/vmparam.h:1.22
--- src/sys/arch/powerpc/include/vmparam.h:1.21 Wed Mar 27 12:16:43 2019
+++ src/sys/arch/powerpc/include/vmparam.h Fri Mar 29 08:51:15 2019
@@ -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 @@ extern const char __USRSTACK; /* let th
#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 */
Index: src/sys/arch/sparc/include/vmparam.h
diff -u src/sys/arch/sparc/include/vmparam.h:1.46 src/sys/arch/sparc/include/vmparam.h:1.47
--- src/sys/arch/sparc/include/vmparam.h:1.46 Thu Mar 28 20:08:13 2019
+++ src/sys/arch/sparc/include/vmparam.h Fri Mar 29 08:51:15 2019
@@ -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.
