git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'stable/swiotlb-0.9' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
hardirq.h
diff --git
a/arch/x86/include/asm/hardirq.h
b/arch/x86/include/asm/hardirq.h
index
aeab29a
..
55e4de6
100644
(file)
--- a/
arch/x86/include/asm/hardirq.h
+++ b/
arch/x86/include/asm/hardirq.h
@@
-14,7
+14,7
@@
typedef struct {
#endif
unsigned int x86_platform_ipis; /* arch dependent */
unsigned int apic_perf_irqs;
- unsigned int apic_
pending
_irqs;
+ unsigned int apic_
irq_work
_irqs;
#ifdef CONFIG_SMP
unsigned int irq_resched_count;
unsigned int irq_call_count;