[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20070611104740.22adc9bc@frecb000686.frec.bull.fr>
Date: Mon, 11 Jun 2007 10:47:40 +0200
From: Sébastien Dugué <sebastien.dugue@...l.net>
To: Thomas Gleixner <tglx@...utronix.de>
Cc: LKML <linux-kernel@...r.kernel.org>, Andrew Morton <akpm@...l.org>,
Ingo Molnar <mingo@...e.hu>, Andi Kleen <ak@...e.de>,
Arjan van de Ven <arjan@...radead.org>,
Venkatesh Pallipadi <venkatesh.pallipadi@...el.com>,
Chris Wright <chrisw@...s-sol.org>,
Jean Pierre Dion <jean-pierre.dion@...l.net>,
Gilles Carry <Gilles.Carry@....bull.net>
Subject: Re: [patch-mm 19/23] x86_64: Convert to cleckevents
Hi Thomas,
On Sun, 10 Jun 2007 09:44:18 -0000 Thomas Gleixner <tglx@...utronix.de> wrote:
> Convert x86_64 to the clockevents code. Share code with i386 for
> hpet and PIT.
>
> Build and whitespace fixups from:
> Venki Pallipadi <venkatesh.pallipadi@...el.com>
> and
> Chris Wright <chrisw@...s-sol.org>
It seems that the hpet clocksource's ->vread has been lost in the conversion.
Is this on purpose?
The patch below fixes it for x86_64 on 2.6.21.3-rt9. If you want it rebased
on -mm let me know.
Thanks,
Sébastien.
---
It seems the hpet clocksource's vread method was lost in the x86_64 conversion
to clockevent. So here it is.
Signed-off-by: Sébastien Dugué <sebastien.dugue@...l.net>
arch/i386/kernel/hpet.c | 10 ++++++++++
1 file changed, 10 insertions(+)
Index: linux-2.6.21.3-rt9/arch/i386/kernel/hpet.c
===================================================================
--- linux-2.6.21.3-rt9.orig/arch/i386/kernel/hpet.c 2007-06-07 15:09:41.000000000 +0200
+++ linux-2.6.21.3-rt9/arch/i386/kernel/hpet.c 2007-06-07 15:50:50.000000000 +0200
@@ -313,6 +313,13 @@ static cycle_t notrace read_hpet(void)
return (cycle_t)hpet_readl(HPET_COUNTER);
}
+#ifdef CONFIG_X86_64
+static notrace cycle_t __vsyscall_fn vread_hpet(void)
+{
+ return readl((const void __iomem *)fix_to_virt(VSYSCALL_HPET) + 0xf0);
+}
+#endif
+
static struct clocksource clocksource_hpet = {
.name = "hpet",
.rating = 250,
@@ -321,6 +328,9 @@ static struct clocksource clocksource_hp
.shift = HPET_SHIFT,
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
.resume = hpet_restart_counter,
+#ifdef CONFIG_X86_64
+ .vread = vread_hpet,
+#endif
};
static int hpet_clocksource_register(void)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists