summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2012-03-19 19:11:27 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2012-03-19 19:11:27 +0000
commit712a8802e8c112bf702161fc0569332e99d6e60c (patch)
tree4ea9e549f03724d8bb8090ee2ded2c9d8c4372b4 /sys
parent12f9da3a469de8b4c643600caa768a370a7c7e28 (diff)
Change the page size computation logic to default to 16KB pages, and only
restrict to 4KB if the kernel is configured with R5000 or RM7000 family support. Allow the kernel configuration to override this if it knows better (e.g. an upcoming kernel configuration with support for R5000, but where physical memory on R5000 systems fits within the first 512MB).
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/sgi/include/param.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/arch/sgi/include/param.h b/sys/arch/sgi/include/param.h
index 14b18d3affd..fd4951f97f6 100644
--- a/sys/arch/sgi/include/param.h
+++ b/sys/arch/sgi/include/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.5 2009/12/12 20:08:08 miod Exp $ */
+/* $OpenBSD: param.h,v 1.6 2012/03/19 19:11:26 miod Exp $ */
/*
* Copyright (c) 2003 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -40,10 +40,12 @@
#define MID_MACHINE MID_MIPS64 /* None but has to be defined */
#ifdef _KERNEL
-#if defined(CPU_R10000) && !defined(CPU_R5000) && !defined(CPU_RM7000)
-#define PAGE_SHIFT 14
-#else
+#ifndef PAGE_SHIFT
+#if defined(CPU_R5000) || defined(CPU_RM7000)
#define PAGE_SHIFT 12
+#else
+#define PAGE_SHIFT 14
+#endif
#endif
#endif /* _KERNEL */