[src/trunk]: src/sys/arch/evbarm/gumstix Please calculate KERNEL_PT_KERNEL_NU...

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

details:   https://anonhg.NetBSD.org/src/rev/46654ad90e20
branches:  trunk
changeset: 751075:46654ad90e20
user:      kiyohara <kiyohara%NetBSD.org@localhost>
date:      Sun Jan 24 03:46:48 2010 +0000

description:
Please calculate KERNEL_PT_KERNEL_NUM from KERNEL_VM_BASE.
Moreover, can define KERNEL_VM_BASE somewhere. (ex. in conf/YOUR_GUMSTIX)
  For instance, allow miniroot.fs over 16Mbytes.

diffstat:

 sys/arch/evbarm/gumstix/gumstix_machdep.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r a598d95fc2a0 -r 46654ad90e20 sys/arch/evbarm/gumstix/gumstix_machdep.c
--- a/sys/arch/evbarm/gumstix/gumstix_machdep.c Sat Jan 23 23:39:27 2010 +0000
+++ b/sys/arch/evbarm/gumstix/gumstix_machdep.c Sun Jan 24 03:46:48 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gumstix_machdep.c,v 1.23 2009/12/26 16:01:24 uebayasi Exp $ */
+/*     $NetBSD: gumstix_machdep.c,v 1.24 2010/01/24 03:46:48 kiyohara Exp $ */
 /*
  * Copyright (C) 2005, 2006, 2007  WIDE Project and SOUM Corporation.
  * All rights reserved.
@@ -185,7 +185,9 @@
 
 /* Kernel text starts 2MB in from the bottom of the kernel address space. */
 #define        KERNEL_TEXT_BASE        (KERNEL_BASE + 0x00200000)
+#ifndef KERNEL_VM_BASE
 #define        KERNEL_VM_BASE          (KERNEL_BASE + 0x01000000)
+#endif
 
 /*
  * The range 0xc1000000 - 0xccffffff is available for kernel VM space
@@ -244,7 +246,7 @@
 
 #define KERNEL_PT_SYS          0       /* Page table for mapping proc0 zero page */
 #define KERNEL_PT_KERNEL       1       /* Page table for mapping kernel */
-#define        KERNEL_PT_KERNEL_NUM    4
+#define        KERNEL_PT_KERNEL_NUM    ((KERNEL_VM_BASE - KERNEL_BASE) >> 22)
 #define KERNEL_PT_VMDATA       (KERNEL_PT_KERNEL+KERNEL_PT_KERNEL_NUM)
                                        /* Page tables for mapping kernel VM */
 #define        KERNEL_PT_VMDATA_NUM    4       /* start with 16MB of KVM */