Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include null IPI functions if !MULTIPROCESSOR.

This commit is contained in:
ad 2008-04-25 13:26:27 +00:00
parent 44baf61c66
commit 1a1d0b7f30
4 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/x86/conf/files.x86
View File

@ -1,4 +1,4 @@
# $NetBSD: files.x86,v 1.40 2008/01/01 20:32:11 yamt Exp $
# $NetBSD: files.x86,v 1.41 2008/04/25 13:26:27 ad Exp $
# options for MP configuration through the MP spec
defflag opt_mpbios.h MPBIOS MPVERBOSE MPDEBUG MPBIOS_SCANPCI
@ -51,7 +51,7 @@ file arch/x86/x86/i8259.c
file arch/x86/x86/idle_machdep.c
file arch/x86/x86/intr.c
file arch/x86/x86/idt.c
file arch/x86/x86/ipi.c multiprocessor
file arch/x86/x86/ipi.c
file arch/x86/x86/msr_ipifuncs.c
file arch/x86/x86/mtrr_i686.c mtrr
file arch/x86/x86/patch.c

27
sys/arch/x86/x86/ipi.c
View File

@ -1,7 +1,7 @@
/* $NetBSD: ipi.c,v 1.9 2008/04/16 16:06:52 cegger Exp $ */
/* $NetBSD: ipi.c,v 1.10 2008/04/25 13:26:27 ad Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* Copyright (c) 2000, 2008 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ipi.c,v 1.9 2008/04/16 16:06:52 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: ipi.c,v 1.10 2008/04/25 13:26:27 ad Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -52,6 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: ipi.c,v 1.9 2008/04/16 16:06:52 cegger Exp $");
#include <machine/i82489reg.h>
#include <machine/i82489var.h>
#ifdef MULTIPROCESSOR
int
x86_send_ipi(struct cpu_info *ci, int ipimask)
{
@ -129,3 +130,23 @@ x86_ipi_handler(void)
(*ipifunc[bit])(ci);
}
}
#else
int
x86_send_ipi(struct cpu_info *ci, int ipimask)
{
return 0;
}
void
x86_broadcast_ipi(int ipimask)
{
}
void
x86_multicast_ipi(int cpumask, int ipimask)
{
}
#endif

4
sys/arch/xen/conf/files.xen
View File

@ -1,4 +1,4 @@
# $NetBSD: files.xen,v 1.83 2008/02/27 04:19:24 dogcow Exp $
# $NetBSD: files.xen,v 1.84 2008/04/25 13:26:27 ad Exp $
# NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp
# NetBSD: files.i386,v 1.254 2004/03/25 23:32:10 jmc Exp
@ -138,7 +138,7 @@ file arch/x86/x86/bus_space.c pci
file arch/x86/x86/cacheinfo.c
file arch/xen/x86/consinit.c
file arch/xen/x86/intr.c
file arch/x86/x86/ipi.c multiprocessor
file arch/x86/x86/ipi.c
file arch/x86/x86/sys_machdep.c
file arch/x86/x86/x86_machdep.c

6
sys/arch/xen/include/intr.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: intr.h,v 1.25 2008/04/19 13:46:12 cegger Exp $ */
/* $NetBSD: intr.h,v 1.26 2008/04/25 13:26:27 ad Exp $ */
/* NetBSD intr.h,v 1.15 2004/10/31 10:39:34 yamt Exp */
/*-
@ -191,6 +191,10 @@ int intr_find_mpmapping(int, int, struct xen_intr_handle *);
struct pic *intr_findpic(int);
void intr_add_pcibus(struct pcibus_attach_args *);
int x86_send_ipi(struct cpu_info *, int);
void x86_broadcast_ipi(int);
void x86_multicast_ipi(int, int);
#endif /* !_LOCORE */
#endif /* _XEN_INTR_H_ */