[src/netbsd-6]: src/sys/arch/amd64/amd64 Pull up following revision(s) (reque...

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

details:   https://anonhg.NetBSD.org/src/rev/1ed2e37edc0e
branches:  netbsd-6
changeset: 774583:1ed2e37edc0e
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Sep 03 19:22:45 2012 +0000

description:
Pull up following revision(s) (requested by cherry in ticket #539):
        sys/arch/amd64/amd64/machdep.c: revision 1.190
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

diffstat:

 sys/arch/amd64/amd64/machdep.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 7033b4b335f1 -r 1ed2e37edc0e sys/arch/amd64/amd64/machdep.c
--- a/sys/arch/amd64/amd64/machdep.c    Mon Sep 03 19:19:54 2012 +0000
+++ b/sys/arch/amd64/amd64/machdep.c    Mon Sep 03 19:22:45 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.175.2.6 2012/06/12 23:13:07 riz Exp $    */
+/*     $NetBSD: machdep.c,v 1.175.2.7 2012/09/03 19:22:45 riz 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.175.2.6 2012/06/12 23:13:07 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.175.2.7 2012/09/03 19:22:45 riz Exp $");
 
 /* #define XENDEBUG_LOW  */
 
@@ -1758,8 +1758,8 @@
        /* Determine physical address space */
        avail_start = first_avail;
        avail_end = ctob(xen_start_info.nr_pages);
-       pmap_pa_start = XPMAP_OFFSET;
-       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 */