diff options
author | Jan Beulich <JBeulich@suse.com> | 2012-02-24 06:50:27 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2012-02-27 02:46:25 -0500 |
commit | d93c4071b78f4676ef70ec8f2d4bae59b6cc5523 (patch) | |
tree | 77034fc41b3dfbdd6ecde41eb36232d042a3513b /arch/x86 | |
parent | 10ea9d6f5663c3ed51f91cd037b4b9b147273cbb (diff) |
x86/time: Eliminate unused irq0_irqs counter
As of v2.6.38 this counter is being maintained without ever being
read.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Link: http://lkml.kernel.org/r/4F4787930200007800074A10@nat28.tlf.novell.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/include/asm/hardirq.h | 1 | ||||
-rw-r--r-- | arch/x86/kernel/time.c | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/include/asm/hardirq.h b/arch/x86/include/asm/hardirq.h index da0b3ca815b7..382f75d735f3 100644 --- a/arch/x86/include/asm/hardirq.h +++ b/arch/x86/include/asm/hardirq.h | |||
@@ -7,7 +7,6 @@ | |||
7 | typedef struct { | 7 | typedef struct { |
8 | unsigned int __softirq_pending; | 8 | unsigned int __softirq_pending; |
9 | unsigned int __nmi_count; /* arch dependent */ | 9 | unsigned int __nmi_count; /* arch dependent */ |
10 | unsigned int irq0_irqs; | ||
11 | #ifdef CONFIG_X86_LOCAL_APIC | 10 | #ifdef CONFIG_X86_LOCAL_APIC |
12 | unsigned int apic_timer_irqs; /* arch dependent */ | 11 | unsigned int apic_timer_irqs; /* arch dependent */ |
13 | unsigned int irq_spurious_count; | 12 | unsigned int irq_spurious_count; |
diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c index dd5fbf4101fc..c6eba2b42673 100644 --- a/arch/x86/kernel/time.c +++ b/arch/x86/kernel/time.c | |||
@@ -57,9 +57,6 @@ EXPORT_SYMBOL(profile_pc); | |||
57 | */ | 57 | */ |
58 | static irqreturn_t timer_interrupt(int irq, void *dev_id) | 58 | static irqreturn_t timer_interrupt(int irq, void *dev_id) |
59 | { | 59 | { |
60 | /* Keep nmi watchdog up to date */ | ||
61 | inc_irq_stat(irq0_irqs); | ||
62 | |||
63 | global_clock_event->event_handler(global_clock_event); | 60 | global_clock_event->event_handler(global_clock_event); |
64 | 61 | ||
65 | /* MCA bus quirk: Acknowledge irq0 by setting bit 7 in port 0x61 */ | 62 | /* MCA bus quirk: Acknowledge irq0 by setting bit 7 in port 0x61 */ |