[src/cherry-xenmp]: src/sys/arch Fix XEN3PAE_DOMx build

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

details:   https://anonhg.NetBSD.org/src/rev/2d532019e663
branches:  cherry-xenmp
changeset: 765627:2d532019e663
user:      cherry <cherry%NetBSD.org@localhost>
date:      Sun Aug 07 19:48:07 2011 +0000

description:
Fix XEN3PAE_DOMx build

diffstat:

 sys/arch/i386/i386/machdep.c |  6 +++---
 sys/arch/xen/x86/cpu.c       |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 14788f3d5a88 -r 2d532019e663 sys/arch/i386/i386/machdep.c
--- a/sys/arch/i386/i386/machdep.c      Sat Aug 06 21:06:34 2011 +0000
+++ b/sys/arch/i386/i386/machdep.c      Sun Aug 07 19:48:07 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.702.2.3 2011/08/06 21:06:34 cherry Exp $ */
+/*     $NetBSD: machdep.c,v 1.702.2.4 2011/08/07 19:48:07 cherry Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.702.2.3 2011/08/06 21:06:34 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.702.2.4 2011/08/07 19:48:07 cherry Exp $");
 
 #include "opt_beep.h"
 #include "opt_compat_ibcs2.h"
@@ -1195,7 +1195,7 @@
                pt_entry_t pg_nx = (cpu_feature[2] & CPUID_NOX ? PG_NX : 0);
 
                pte = kvtopte((vaddr_t)gdt);
-               npte = pmap_pa2pte((paddr_t)gdt - KERNBASE);
+               npte = pmap_pa2pte((vaddr_t)gdt - KERNBASE);
                npte |= PG_RO | pg_nx | PG_V;
 
                xpq_queue_lock();
diff -r 14788f3d5a88 -r 2d532019e663 sys/arch/xen/x86/cpu.c
--- a/sys/arch/xen/x86/cpu.c    Sat Aug 06 21:06:34 2011 +0000
+++ b/sys/arch/xen/x86/cpu.c    Sun Aug 07 19:48:07 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.56.2.4 2011/07/31 20:49:11 cherry Exp $      */
+/*     $NetBSD: cpu.c,v 1.56.2.5 2011/08/07 19:48:08 cherry Exp $      */
 /* NetBSD: cpu.c,v 1.18 2004/02/20 17:35:01 yamt Exp  */
 
 /*-
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.56.2.4 2011/07/31 20:49:11 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.56.2.5 2011/08/07 19:48:08 cherry Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -140,7 +140,7 @@
        bool sc_wasonline;
 };
 
-int mp_cpu_start(struct cpu_info *, paddr_t);
+int mp_cpu_start(struct cpu_info *, vaddr_t);
 void mp_cpu_start_cleanup(struct cpu_info *);
 const struct cpu_functions mp_cpu_funcs = { mp_cpu_start, NULL,
                                      mp_cpu_start_cleanup };