Module Name: src
Committed By: cherry
Date: Sun Nov 6 15:51:09 UTC 2011
Modified Files:
src/sys/arch/amd64/amd64: machdep.c
Log Message:
DTRT with macros and use xen's info page when initialising pmap_pa_start and
pmap_pa_end.
To generate a diff of this commit:
cvs rdiff -u -r1.168 -r1.169 src/sys/arch/amd64/amd64/machdep.c
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/amd64/amd64/machdep.c
diff -u src/sys/arch/amd64/amd64/machdep.c:1.168 src/sys/arch/amd64/amd64/machdep.c:1.169
--- src/sys/arch/amd64/amd64/machdep.c:1.168 Mon Oct 31 12:42:36 2011
+++ src/sys/arch/amd64/amd64/machdep.c Sun Nov 6 15:51:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.168 2011/10/31 12:42:36 yamt Exp $ */
+/* $NetBSD: machdep.c,v 1.169 2011/11/06 15:51:09 cherry Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011
@@ -111,7 +111,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.168 2011/10/31 12:42:36 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.169 2011/11/06 15:51:09 cherry Exp $");
/* #define XENDEBUG_LOW */
@@ -1684,8 +1684,8 @@ init_x86_64(paddr_t first_avail)
/* Determine physical address space */
avail_start = first_avail;
avail_end = ctob(xen_start_info.nr_pages);
- pmap_pa_start = (KERNTEXTOFF - KERNBASE);
- pmap_pa_end = avail_end;
+ pmap_pa_start = XPMAP_OFFSET;
+ pmap_pa_end = pmap_pa_start + ctob(xen_start_info.nr_pages);
__PRINTK(("pmap_pa_start 0x%lx avail_start 0x%lx avail_end 0x%lx\n",
pmap_pa_start, avail_start, avail_end));
#endif /* !XEN */
