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
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
include
/
asm-i386
/
io_apic.h
diff --git
a/include/asm-i386/io_apic.h
b/include/asm-i386/io_apic.h
index
861ecee
..
a387a7f
100644
(file)
--- a/
include/asm-i386/io_apic.h
+++ b/
include/asm-i386/io_apic.h
@@
-13,7
+13,7
@@
#ifdef CONFIG_X86_IO_APIC
#ifdef CONFIG_X86_IO_APIC
-#ifdef CONFIG_PCI_
USE_VECTOR
+#ifdef CONFIG_PCI_
MSI
static inline int use_pci_vector(void) {return 1;}
static inline void disable_edge_ioapic_vector(unsigned int vector) { }
static inline void mask_and_ack_level_ioapic_vector(unsigned int vector) { }
static inline int use_pci_vector(void) {return 1;}
static inline void disable_edge_ioapic_vector(unsigned int vector) { }
static inline void mask_and_ack_level_ioapic_vector(unsigned int vector) { }
@@
-188,15
+188,6
@@
static inline void io_apic_modify(unsigned int apic, unsigned int reg, unsigned
*(IO_APIC_BASE(apic)+4) = value;
}
*(IO_APIC_BASE(apic)+4) = value;
}
-/*
- * Synchronize the IO-APIC and the CPU by doing
- * a dummy read from the IO-APIC
- */
-static inline void io_apic_sync(unsigned int apic)
-{
- (void) *(IO_APIC_BASE(apic)+4);
-}
-
/* 1 if "noapic" boot option passed */
extern int skip_ioapic_setup;
/* 1 if "noapic" boot option passed */
extern int skip_ioapic_setup;