public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [patch 2.6.27-rc6] x86_64 minor HPET tweakage
@ 2008-09-12 17:18 David Brownell
  2008-09-14 14:37 ` Ingo Molnar
  0 siblings, 1 reply; 2+ messages in thread
From: David Brownell @ 2008-09-12 17:18 UTC (permalink / raw)
  To: lkml

From: David Brownell <dbrownell@users.sourceforge.net>

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@users.sourceforge.net>
---
 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);
 }

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [patch 2.6.27-rc6] x86_64 minor HPET tweakage
  2008-09-12 17:18 [patch 2.6.27-rc6] x86_64 minor HPET tweakage David Brownell
@ 2008-09-14 14:37 ` Ingo Molnar
  0 siblings, 0 replies; 2+ messages in thread
From: Ingo Molnar @ 2008-09-14 14:37 UTC (permalink / raw)
  To: David Brownell; +Cc: lkml, Thomas Gleixner


* David Brownell <david-b@pacbell.net> wrote:

> From: David Brownell <dbrownell@users.sourceforge.net>
> 
> 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@users.sourceforge.net>

applied to tip/timers/clockevents - thanks David!

	Ingo

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-09-14 14:37 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-09-12 17:18 [patch 2.6.27-rc6] x86_64 minor HPET tweakage David Brownell
2008-09-14 14:37 ` Ingo Molnar

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox