git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
apic-xen.c
diff --git
a/arch/i386/kernel/apic-xen.c
b/arch/i386/kernel/apic-xen.c
index
ecd4b69
..
d7bff41
100644
(file)
--- a/
arch/i386/kernel/apic-xen.c
+++ b/
arch/i386/kernel/apic-xen.c
@@
-14,7
+14,6
@@
* Mikael Pettersson : PM converted to driver model.
*/
* Mikael Pettersson : PM converted to driver model.
*/
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/mm.h>
#include <linux/init.h>
#include <linux/mm.h>
@@
-36,6
+35,7
@@
#include <asm/arch_hooks.h>
#include <asm/hpet.h>
#include <asm/i8253.h>
#include <asm/arch_hooks.h>
#include <asm/hpet.h>
#include <asm/i8253.h>
+#include <asm/nmi.h>
#include <mach_apic.h>
#include <mach_apicdef.h>
#include <mach_apic.h>
#include <mach_apicdef.h>
@@
-61,7
+61,7
@@
int enable_local_apic __initdata = 0; /* -1=force-disable, +1=force-enable */
*/
int apic_verbosity;
*/
int apic_verbosity;
-int modern_apic(void)
+
static
int modern_apic(void)
{
#ifndef CONFIG_XEN
unsigned int lvr, version;
{
#ifndef CONFIG_XEN
unsigned int lvr, version;