git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into perfcounters/core-v2
[safe/jmp/linux-2.6]
/
arch
/
x86
/
include
/
asm
/
hardirq.h
diff --git
a/arch/x86/include/asm/hardirq.h
b/arch/x86/include/asm/hardirq.h
index
46ebed7
..
2545442
100644
(file)
--- a/
arch/x86/include/asm/hardirq.h
+++ b/
arch/x86/include/asm/hardirq.h
@@
-12,6
+12,7
@@
typedef struct {
unsigned int apic_timer_irqs; /* arch dependent */
unsigned int irq_spurious_count;
#endif
+ unsigned int generic_irqs; /* arch dependent */
unsigned int apic_perf_irqs;
#ifdef CONFIG_SMP
unsigned int irq_resched_count;