[src/cherry-xenmp]: src/sys/arch Make this build without 'options MULTIPROCES...

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

details:   https://anonhg.NetBSD.org/src/rev/88ce4a19a991
branches:  cherry-xenmp
changeset: 765645:88ce4a19a991
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Fri Oct 21 18:08:44 2011 +0000

description:
Make this build without 'options MULTIPROCESSOR'

diffstat:

 sys/arch/amd64/amd64/fpu.c     |   6 +++---
 sys/arch/x86/x86/x86_machdep.c |  10 +++++-----
 sys/arch/xen/x86/x86_xpmap.c   |   6 ++----
 3 files changed, 10 insertions(+), 12 deletions(-)

diffs (100 lines):

diff -r 9a8c5ccfb0dd -r 88ce4a19a991 sys/arch/amd64/amd64/fpu.c
--- a/sys/arch/amd64/amd64/fpu.c        Tue Sep 20 18:57:50 2011 +0000
+++ b/sys/arch/amd64/amd64/fpu.c        Fri Oct 21 18:08:44 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fpu.c,v 1.34.2.1 2011/06/03 13:27:37 cherry Exp $      */
+/*     $NetBSD: fpu.c,v 1.34.2.2 2011/10/21 18:08:44 bouyer Exp $      */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.  All
@@ -100,7 +100,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.34.2.1 2011/06/03 13:27:37 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.34.2.2 2011/10/21 18:08:44 bouyer Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -407,7 +407,7 @@
                }
                splx(s);
 #ifdef XEN
-               xen_send_ipi(oci, XEN_IPI_SYNCH_FPU);
+               (void)xen_send_ipi(oci, XEN_IPI_SYNCH_FPU);
 #else /* XEN */
                x86_send_ipi(oci, X86_IPI_SYNCH_FPU);
 #endif
diff -r 9a8c5ccfb0dd -r 88ce4a19a991 sys/arch/x86/x86/x86_machdep.c
--- a/sys/arch/x86/x86/x86_machdep.c    Tue Sep 20 18:57:50 2011 +0000
+++ b/sys/arch/x86/x86/x86_machdep.c    Fri Oct 21 18:08:44 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: x86_machdep.c,v 1.50.2.2 2011/06/23 14:19:49 cherry Exp $      */
+/*     $NetBSD: x86_machdep.c,v 1.50.2.3 2011/10/21 18:08:44 bouyer Exp $      */
 
 /*-
  * Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.50.2.2 2011/06/23 14:19:49 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.50.2.3 2011/10/21 18:08:44 bouyer Exp $");
 
 #include "opt_modular.h"
 #include "opt_physmem.h"
@@ -201,7 +201,7 @@
                        return;
                if (x86_cpu_idle_ipi != false) {
 #ifdef XEN
-                       xen_send_ipi(ci, XEN_IPI_KICK);
+                       (void)xen_send_ipi(ci, XEN_IPI_KICK);
 #else /* XEN */
                        x86_send_ipi(ci, 0);
 #endif /* XEN */
@@ -227,7 +227,7 @@
        }
        if ((flags & RESCHED_IMMED) != 0) {
 #ifdef XEN
-               xen_send_ipi(ci, XEN_IPI_KICK);
+               (void)xen_send_ipi(ci, XEN_IPI_KICK);
 #else /* XEN */
                x86_send_ipi(ci, 0);
 #endif /* XEN */
@@ -242,7 +242,7 @@
        aston(l, X86_AST_GENERIC);
        if (l->l_cpu != curcpu())
 #ifdef XEN
-               xen_send_ipi(l->l_cpu, XEN_IPI_KICK);
+               (void)xen_send_ipi(l->l_cpu, XEN_IPI_KICK);
 #else /* XEN */
                x86_send_ipi(l->l_cpu, 0);
 #endif /* XEN */
diff -r 9a8c5ccfb0dd -r 88ce4a19a991 sys/arch/xen/x86/x86_xpmap.c
--- a/sys/arch/xen/x86/x86_xpmap.c      Tue Sep 20 18:57:50 2011 +0000
+++ b/sys/arch/xen/x86/x86_xpmap.c      Fri Oct 21 18:08:44 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: x86_xpmap.c,v 1.26.2.11 2011/09/20 18:57:53 cherry Exp $       */
+/*     $NetBSD: x86_xpmap.c,v 1.26.2.12 2011/10/21 18:08:44 bouyer Exp $       */
 
 /*
  * Copyright (c) 2006 Mathieu Ropert <mro%adviseo.fr@localhost>
@@ -69,7 +69,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.26.2.11 2011/09/20 18:57:53 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.26.2.12 2011/10/21 18:08:44 bouyer Exp $");
 
 #include "opt_xen.h"
 #include "opt_ddb.h"
@@ -165,9 +165,7 @@
 static mmu_update_t xpq_queue_array[MAXCPUS][XPQUEUE_SIZE];
 static int xpq_idx_array[MAXCPUS];
 
-#ifdef MULTIPROCESSOR
 extern struct cpu_info * (*xpq_cpu)(void);
-#endif /* MULTIPROCESSOR */
 
 void
 xpq_flush_queue(void)