[src/trunk]: src/sys/arch/x86/x86 Fix pae xen build.

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

details:   https://anonhg.NetBSD.org/src/rev/bcae56c3bc43
branches:  trunk
changeset: 773119:bcae56c3bc43
user:      cherry <cherry%NetBSD.org@localhost>
date:      Sat Jan 28 08:57:09 2012 +0000

description:
Fix pae xen build.

diffstat:

 sys/arch/x86/x86/pmap.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (35 lines):

diff -r 87f08ddcf21f -r bcae56c3bc43 sys/arch/x86/x86/pmap.c
--- a/sys/arch/x86/x86/pmap.c   Sat Jan 28 08:37:22 2012 +0000
+++ b/sys/arch/x86/x86/pmap.c   Sat Jan 28 08:57:09 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.156 2012/01/28 07:19:17 cherry Exp $        */
+/*     $NetBSD: pmap.c,v 1.157 2012/01/28 08:57:09 cherry Exp $        */
 
 /*-
  * Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
@@ -171,7 +171,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.156 2012/01/28 07:19:17 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.157 2012/01/28 08:57:09 cherry Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
@@ -795,13 +795,13 @@
        pmap->pm_ncsw = l->l_ncsw;
        *pmap2 = curpmap;
        *ptepp = PTE_BASE;
-#ifdef XEN
+#if defined(XEN) && defined(__x86_64__)
        KASSERT(ci->ci_normal_pdes[PTP_LEVELS - 2] == L4_BASE);
        ci->ci_normal_pdes[PTP_LEVELS - 2] = pmap->pm_pdir;
        *pdeppp = ci->ci_normal_pdes;
-#else /* XEN */
+#else /* XEN && __x86_64__ */
        *pdeppp = normal_pdes;
-#endif /* XEN */
+#endif /* XEN && __x86_64__ */
 }
 
 /*