Module Name: src
Committed By: bouyer
Date: Fri Oct 21 18:08:44 UTC 2011
Modified Files:
src/sys/arch/amd64/amd64 [cherry-xenmp]: fpu.c
src/sys/arch/x86/x86 [cherry-xenmp]: x86_machdep.c
src/sys/arch/xen/x86 [cherry-xenmp]: x86_xpmap.c
Log Message:
Make this build without 'options MULTIPROCESSOR'
To generate a diff of this commit:
cvs rdiff -u -r1.34.2.1 -r1.34.2.2 src/sys/arch/amd64/amd64/fpu.c
cvs rdiff -u -r1.50.2.2 -r1.50.2.3 src/sys/arch/x86/x86/x86_machdep.c
cvs rdiff -u -r1.26.2.11 -r1.26.2.12 src/sys/arch/xen/x86/x86_xpmap.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/fpu.c
diff -u src/sys/arch/amd64/amd64/fpu.c:1.34.2.1 src/sys/arch/amd64/amd64/fpu.c:1.34.2.2
--- src/sys/arch/amd64/amd64/fpu.c:1.34.2.1 Fri Jun 3 13:27:37 2011
+++ src/sys/arch/amd64/amd64/fpu.c Fri Oct 21 18:08:44 2011
@@ -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 @@ fpusave_lwp(struct lwp *l, bool save)
}
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
Index: src/sys/arch/x86/x86/x86_machdep.c
diff -u src/sys/arch/x86/x86/x86_machdep.c:1.50.2.2 src/sys/arch/x86/x86/x86_machdep.c:1.50.2.3
--- src/sys/arch/x86/x86/x86_machdep.c:1.50.2.2 Thu Jun 23 14:19:49 2011
+++ src/sys/arch/x86/x86/x86_machdep.c Fri Oct 21 18:08:44 2011
@@ -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 @@ cpu_need_resched(struct cpu_info *ci, in
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 @@ cpu_need_resched(struct cpu_info *ci, in
}
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 @@ cpu_signotify(struct lwp *l)
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 */
Index: src/sys/arch/xen/x86/x86_xpmap.c
diff -u src/sys/arch/xen/x86/x86_xpmap.c:1.26.2.11 src/sys/arch/xen/x86/x86_xpmap.c:1.26.2.12
--- src/sys/arch/xen/x86/x86_xpmap.c:1.26.2.11 Tue Sep 20 18:57:53 2011
+++ src/sys/arch/xen/x86/x86_xpmap.c Fri Oct 21 18:08:44 2011
@@ -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 <[email protected]>
@@ -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 @@ void xpq_debug_dump(void);
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)
