Module Name: src
Committed By: cherry
Date: Mon Sep 3 05:01:45 UTC 2012
Modified Files:
src/sys/arch/amd64/amd64: machdep.c
Log Message:
Revert to unmanaged x86 memory mapped isa and pci space.
This is a revert of commit r1.169:
http://mail-index.netbsd.org/source-changes/2011/11/06/msg028702.html
This should allow X to run on NetBSD/xen amd64 dom0, and fixes PR #46634
To generate a diff of this commit:
cvs rdiff -u -r1.189 -r1.190 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.189 src/sys/arch/amd64/amd64/machdep.c:1.190
--- src/sys/arch/amd64/amd64/machdep.c:1.189 Sun Jul 15 15:17:56 2012
+++ src/sys/arch/amd64/amd64/machdep.c Mon Sep 3 05:01:44 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.189 2012/07/15 15:17:56 dsl Exp $ */
+/* $NetBSD: machdep.c,v 1.190 2012/09/03 05:01:44 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.189 2012/07/15 15:17:56 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.190 2012/09/03 05:01:44 cherry Exp $");
/* #define XENDEBUG_LOW */
@@ -1723,8 +1723,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 = 0;
- pmap_pa_end = pmap_pa_start + ctob(xen_start_info.nr_pages);
+ pmap_pa_start = (KERNTEXTOFF - KERNBASE);
+ pmap_pa_end = avail_end;
__PRINTK(("pmap_pa_start 0x%lx avail_start 0x%lx avail_end 0x%lx\n",
pmap_pa_start, avail_start, avail_end));
#endif /* !XEN */
