projects
/
linux-2.6-block.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/mce3
[linux-2.6-block.git]
/
arch
/
x86
/
include
/
asm
/
entry_arch.h
diff --git
a/arch/x86/include/asm/entry_arch.h
b/arch/x86/include/asm/entry_arch.h
index 69f886805ecb243a33a774f2118d51c22870b171..ff8cbfa07851a1b2ce121f70b84e4d4269331dfb 100644
(file)
--- a/
arch/x86/include/asm/entry_arch.h
+++ b/
arch/x86/include/asm/entry_arch.h
@@
-50,7
+50,7
@@
BUILD_INTERRUPT(error_interrupt,ERROR_APIC_VECTOR)
BUILD_INTERRUPT(spurious_interrupt,SPURIOUS_APIC_VECTOR)
#ifdef CONFIG_PERF_COUNTERS
-BUILD_INTERRUPT(perf_
counter_interrupt, LOCAL_PERF
_VECTOR)
+BUILD_INTERRUPT(perf_
pending_interrupt, LOCAL_PENDING
_VECTOR)
#endif
#ifdef CONFIG_X86_THERMAL_VECTOR