summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/hardirq.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-08 13:38:21 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-08 13:38:21 -0800
commit4646575daf21f544fc2f7e8d90d8c488948fcc7c (patch)
treefa0208fa11662c2d36e74cf6152288f8fbf7ddc9 /arch/x86/include/asm/hardirq.h
parent86ed4aa457f9c832856156a2ee6477d108825855 (diff)
parent581f202bcd60acbc3af1f5faa429e570c512f8a3 (diff)
downloadtalos-op-linux-4646575daf21f544fc2f7e8d90d8c488948fcc7c.tar.gz
talos-op-linux-4646575daf21f544fc2f7e8d90d8c488948fcc7c.zip
Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: UV RTC: Always enable RTC clocksource x86: UV RTC: Rename generic_interrupt to x86_platform_ipi x86: UV RTC: Clean up error handling x86: UV RTC: Add clocksource only boot option x86: UV RTC: Fix early expiry handling
Diffstat (limited to 'arch/x86/include/asm/hardirq.h')
-rw-r--r--arch/x86/include/asm/hardirq.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/hardirq.h b/arch/x86/include/asm/hardirq.h
index 108eb6fd1ae7..0f8576427cfe 100644
--- a/arch/x86/include/asm/hardirq.h
+++ b/arch/x86/include/asm/hardirq.h
@@ -12,7 +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 x86_platform_ipis; /* arch dependent */
unsigned int apic_perf_irqs;
unsigned int apic_pending_irqs;
#ifdef CONFIG_SMP
OpenPOWER on IntegriCloud