PERFORCE change 28304 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=28304

Change 28304 by peter at peter_overcee on 2003/04/05 23:14:03

	lets try for something easy.. 1G user, 3G kernel.  That puts all
	the symbols below the 2G mark.

Affected files ...

.. //depot/projects/hammer/sys/conf/Makefile.x86_64#7 edit
.. //depot/projects/hammer/sys/x86_64/include/pmap.h#13 edit
.. //depot/projects/hammer/sys/x86_64/include/vmparam.h#5 edit

Differences ...

==== //depot/projects/hammer/sys/conf/Makefile.x86_64#7 (text+ko) ====

@@ -21,7 +21,7 @@
 CWARNFLAGS=     -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
                 -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
                 -ffreestanding -Wno-format
-CC=             x86_64-unknown-freebsd5.0-gcc -mcmodel=medium
+CC=             x86_64-unknown-freebsd5.0-gcc
 LD=             x86_64-unknown-freebsd5.0-ld
 NM=             x86_64-unknown-freebsd5.0-nm
 SIZE=           x86_64-unknown-freebsd5.0-size

==== //depot/projects/hammer/sys/x86_64/include/pmap.h#13 (text+ko) ====

@@ -87,7 +87,7 @@
  * entries.  We use half of them for the kernel due to the 48 bit
  * virtual address sign extension.
  */
-#define KVA_PAGES	512
+#define KVA_PAGES	1536
   
 /*
  * Pte related macros.  This is complicated by having to deal with
@@ -106,7 +106,7 @@
 #define	NKPT		120	/* initial number of kernel page tables */
 #endif
 #ifndef	NKPDE
-#define	NKPDE	(KVA_PAGES - 1)	/* number of page tables/pde's */
+#define	NKPDE	(KVA_PAGES)	/* number of page tables/pde's */
 #endif
 #define NKPML4E	(1)		/* addressable number of page tables/pde's */
 #define NKPDPE	(1)		/* addressable number of page tables/pde's */
@@ -114,7 +114,7 @@
 /*
  * The *PTDI values control the layout of virtual memory
  */
-#define	KPTDI		((NPDEPTD-1)-NKPDE)/* start of kernel virtual pde's */
+#define	KPTDI		(NPDEPTD-NKPDE)	/* start of kernel virtual pde's */
 #define	PTDPTDI		(KPTDI-NPGPTD)	/* ptd entry that points to ptd! */
 
 /*

==== //depot/projects/hammer/sys/x86_64/include/vmparam.h#5 (text+ko) ====

@@ -89,7 +89,7 @@
 #define VM_MAX_KERNEL_ADDRESS	VADDR(0, 0, KPTDI+NKPDE, 0)
 #define VM_MIN_KERNEL_ADDRESS	VADDR(0, 0, PTDPTDI, PTDPTDI)
 
-#define	KERNBASE		VM_MIN_KERNEL_ADDRESS
+#define	KERNBASE		VADDR(0, 0, KPTDI, 0)
 
 #define UPT_MAX_ADDRESS		VADDR(0, 0, PTDPTDI, PTDPTDI)
 #define UPT_MIN_ADDRESS		VADDR(0, 0, PTDPTDI, 0)