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
/
kernel
/
traps.c
diff --git
a/arch/x86/kernel/traps.c
b/arch/x86/kernel/traps.c
index c3aca0b533a1e79cfc3db343308ddf45a39babbb..b7b0f74a215024ddd5881bce823083355ad1e3d0 100644
(file)
--- a/
arch/x86/kernel/traps.c
+++ b/
arch/x86/kernel/traps.c
@@
-72,7
+72,7
@@
#include <asm/proto.h>
#endif
#include <asm/proto.h>
#endif
-DECLARE_BITMAP(
used
_vectors, NR_VECTORS);
+DECLARE_BITMAP(
system
_vectors, NR_VECTORS);
static inline void cond_local_irq_enable(struct pt_regs *regs)
{
static inline void cond_local_irq_enable(struct pt_regs *regs)
{