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 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
include
/
asm
/
irq_vectors.h
diff --git
a/arch/x86/include/asm/irq_vectors.h
b/arch/x86/include/asm/irq_vectors.h
index c20ffca8fef1782ec8fdca8cad5e38b57b014120..67421f649cfa18d064a259bbbd78b30ebd44144a 100644
(file)
--- a/
arch/x86/include/asm/irq_vectors.h
+++ b/
arch/x86/include/asm/irq_vectors.h
@@
-102,12
+102,8
@@
#define POSTED_INTR_NESTED_VECTOR 0xf0
#endif
#define POSTED_INTR_NESTED_VECTOR 0xf0
#endif
-/*
- * Local APIC timer IRQ vector is on a different priority level,
- * to work around the 'lost local interrupt if more than 2 IRQ
- * sources per level' errata.
- */
-#define LOCAL_TIMER_VECTOR 0xef
+#define MANAGED_IRQ_SHUTDOWN_VECTOR 0xef
+#define LOCAL_TIMER_VECTOR 0xee
#define NR_VECTORS 256
#define NR_VECTORS 256