git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into x86/x2apic
[sfrench/cifs-2.6.git]
/
include
/
asm-x86
/
genapic_64.h
diff --git
a/include/asm-x86/genapic_64.h
b/include/asm-x86/genapic_64.h
index 8ff2589da93bb00a58adede7b36cd7d17c3f46eb..2871b3fccb21333590c601e0a312cbd67c859be8 100644
(file)
--- a/
include/asm-x86/genapic_64.h
+++ b/
include/asm-x86/genapic_64.h
@@
-53,10
+53,4
@@
extern int uv_wakeup_secondary(int phys_apicid, unsigned int start_rip);
extern void setup_apic_routing(void);
-#ifdef CONFIG_X86_IO_APIC
-extern void force_mask_ioapic_irq_2(void);
-#else
-static inline void force_mask_ioapic_irq_2(void) { }
-#endif
-
#endif