diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-28 11:54:49 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-28 11:54:49 -0400 |
| commit | d1a76187a5be4f89c6cb19d800cb5fb7aac735c5 (patch) | |
| tree | 2fac3ffbfffc7560eeef8364b541d0d7a0057920 /arch/x86/include/asm/hardirq.h | |
| parent | c7e78cff6b7518212247fb20b1dc6411540dc9af (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
Merge commit 'v2.6.28-rc2' into core/locking
Conflicts:
arch/um/include/asm/system.h
Diffstat (limited to 'arch/x86/include/asm/hardirq.h')
| -rw-r--r-- | arch/x86/include/asm/hardirq.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/x86/include/asm/hardirq.h b/arch/x86/include/asm/hardirq.h new file mode 100644 index 000000000000..000787df66e6 --- /dev/null +++ b/arch/x86/include/asm/hardirq.h | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | #ifdef CONFIG_X86_32 | ||
| 2 | # include "hardirq_32.h" | ||
| 3 | #else | ||
| 4 | # include "hardirq_64.h" | ||
| 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 | ||