[patch 2.6.27-rc6] x86_64 minor HPET tweakage

[David Brownell]

From: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>

Minor HPET tweakage on x86_64: Label the /proc/interrupts entry
as "hpet" or "pit", matching the device and its clockevent name
in /proc/timer_list.

Signed-off-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
---
 arch/x86/kernel/time_64.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- a/arch/x86/kernel/time_64.c
+++ b/arch/x86/kernel/time_64.c
@@ -103,13 +103,15 @@ static struct irqaction irq0 = {
 	.handler	= timer_event_interrupt,
 	.flags		= IRQF_DISABLED | IRQF_IRQPOLL | IRQF_NOBALANCING,
 	.mask		= CPU_MASK_NONE,
-	.name		= "timer"
+	.name		= "hpet"
 };
 
 void __init hpet_time_init(void)
 {
-	if (!hpet_enable())
+	if (!hpet_enable()) {
+		irq0.name = "pit";
 		setup_pit_timer();
+	}
 
 	setup_irq(0, &irq0);
 }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/