diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-15 17:12:58 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-15 17:12:58 -0400 |
| commit | 1e09481365ce248dbb4eb06dad70129bb5807037 (patch) | |
| tree | c0cff5bef95c8b5e7486f144718ade9a06c284dc /include/asm-x86/hardirq.h | |
| parent | 3e2f69fdd1b00166e7d589bce56b2d36a9e74374 (diff) | |
| parent | b9d2252c1e44fa83a4e65fdc9eb93db6297c55af (diff) | |
Merge branch 'linus' into core/softlockup
Conflicts:
kernel/softlockup.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/hardirq.h')
| -rw-r--r-- | include/asm-x86/hardirq.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/asm-x86/hardirq.h b/include/asm-x86/hardirq.h index 314434d664e7..000787df66e6 100644 --- a/include/asm-x86/hardirq.h +++ b/include/asm-x86/hardirq.h | |||
| @@ -3,3 +3,9 @@ | |||
| 3 | #else | 3 | #else |
| 4 | # include "hardirq_64.h" | 4 | # include "hardirq_64.h" |
| 5 | #endif | 5 | #endif |
| 6 | |||
| 7 | extern u64 arch_irq_stat_cpu(unsigned int cpu); | ||
| 8 | #define arch_irq_stat_cpu arch_irq_stat_cpu | ||
| 9 | |||
| 10 | extern u64 arch_irq_stat(void); | ||
| 11 | #define arch_irq_stat arch_irq_stat | ||