From: Thomas Gleixner <tglx@linutronix.de>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: "Andi Kleen" <ak@suse.de>, "Ingo Molnar" <mingo@elte.hu>,
"Arjan van de Ven" <arjan@infradead.org>,
"Venkatesh Pallipadi" <venkatesh.pallipadi@intel.com>,
"John Stultz" <johnstul@us.ibm.com>,
"Chris Wright" <chrisw@sous-sol.org>,
LKML <linux-kernel@vger.kernel.org>,
"Sébastien Dugué" <sebastien.dugue@bull.net>
Subject: [patch -mm 24/28] x86_64: hpet restore vread
Date: Sat, 23 Jun 2007 13:32:49 -0000 [thread overview]
Message-ID: <20070623124031.210773624@inhelltoy.tec.linutronix.de> (raw)
In-Reply-To: 20070623124005.931747831@inhelltoy.tec.linutronix.de
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: x86-64-hpet-restore-vread.patch --]
[-- Type: text/plain, Size: 1198 bytes --]
>From sebastien.dugue@bull.net
It seems the hpet clocksource's vread method was lost in the x86_64 conversion
to clockevents. So here it is.
Signed-off-by: Sébastien Dugué <sebastien.dugue@bull.net>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/i386/kernel/hpet.c | 10 ++++++++++
1 file changed, 10 insertions(+)
Index: linux-2.6.22-rc4-mm/arch/i386/kernel/hpet.c
===================================================================
--- linux-2.6.22-rc4-mm.orig/arch/i386/kernel/hpet.c 2007-06-23 14:39:00.000000000 +0200
+++ linux-2.6.22-rc4-mm/arch/i386/kernel/hpet.c 2007-06-23 14:39:00.000000000 +0200
@@ -255,6 +255,13 @@ static cycle_t read_hpet(void)
return (cycle_t)hpet_readl(HPET_COUNTER);
}
+#ifdef CONFIG_X86_64
+static 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,
@@ -263,6 +270,9 @@ static struct clocksource clocksource_hp
.shift = HPET_SHIFT,
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
.resume = hpet_start_counter,
+#ifdef CONFIG_X86_64
+ .vread = vread_hpet,
+#endif
};
/*
--
next prev parent reply other threads:[~2007-06-23 13:29 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-23 13:32 [patch-mm 00/28] High resolution timer updates and x86_64 support - V3 Thomas Gleixner
2007-06-23 13:32 ` [patch -mm 01/28] NOHZ: Fix nox x86 dyntick idle handling Thomas Gleixner
2007-06-23 13:32 ` [patch -mm 02/28] ACPI: Move timer broadcast and pmtimer access before C3 arbiter shutdown Thomas Gleixner
2007-06-23 13:32 ` [patch -mm 03/28] clockevents: fix typo in acpi_pm.c Thomas Gleixner
2007-06-23 13:32 ` [patch -mm 04/28] Timekeeping: Fixup shadow variable argument Thomas Gleixner
2007-06-23 13:32 ` [patch -mm 05/28] timer.c cleanup recently introduced whitespace damage Thomas Gleixner
2007-06-23 13:32 ` [patch -mm 06/28] Clockevents remove prototypes of removed functions Thomas Gleixner
2007-06-23 13:32 ` [patch -mm 07/28] clockevents: Fix resume logic Thomas Gleixner
2007-06-23 13:32 ` [patch -mm 08/28] clockevents: Fix device replacement Thomas Gleixner
2007-06-23 13:32 ` [patch -mm 09/28] Tick management: spread timer interrupt Thomas Gleixner
2007-06-26 0:11 ` Andrew Morton
2007-06-23 13:32 ` [patch -mm 10/28] highres: Improve debug output Thomas Gleixner
2007-06-26 0:14 ` Andrew Morton
2007-06-26 12:16 ` Thomas Gleixner
2007-06-23 13:32 ` [patch -mm 11/28] hrtimer: speedup hrtimer_enqueue Thomas Gleixner
2007-06-23 13:32 ` [patch -mm 12/28] pcspkr: use the global PIT lock Thomas Gleixner
2007-06-23 13:32 ` [patch -mm 13/28] NTP: Move the cmos update code into ntp.c Thomas Gleixner
2007-06-23 13:32 ` [patch -mm 14/28] i386: PIT stop only, when in periodic or oneshot mode Thomas Gleixner
2007-06-23 13:32 ` [patch -mm 15/28] i386: remove volatile in apic.c Thomas Gleixner
2007-06-23 13:32 ` [patch -mm 16/28] i386: hpet assumes boot cpu is 0 Thomas Gleixner
2007-06-23 13:32 ` [patch -mm 17/28] i386: move PIT function declarations and constants to correct header file Thomas Gleixner
2007-06-23 13:32 ` [patch -mm 18/28] x86_64: untangle asm/hpet.h from asm/timex.h Thomas Gleixner
2007-06-23 13:32 ` [patch -mm 19/28] x86_64: Use generic cmos update Thomas Gleixner
2007-06-23 13:32 ` [patch -mm 20/28] x86-64: remove dead code and other janitor work in tsc.c Thomas Gleixner
2007-06-23 13:32 ` [patch -mm 21/28] x86-64: Fix APIC typo Thomas Gleixner
2007-06-23 13:32 ` [patch -mm 22/28] x86_64: Convert to cleckevents Thomas Gleixner
2007-06-26 0:27 ` Andrew Morton
2007-06-23 13:32 ` [patch -mm 23/28] ACPI: Remove the useless ifdef code Thomas Gleixner
2007-06-23 13:32 ` Thomas Gleixner [this message]
2007-06-23 13:32 ` [patch -mm 25/28] x86_64: restore restore nohpet cmdline Thomas Gleixner
2007-06-23 13:32 ` [patch -mm 26/28] x86-64 block irq balancing for timer Thomas Gleixner
2007-06-23 21:27 ` Arjan van de Ven
2007-06-24 0:04 ` Andreas Kleen
2007-06-24 1:20 ` Arjan van de Ven
2007-06-23 13:32 ` [patch -mm 27/28] x86_64: prep idle loop for dynticks Thomas Gleixner
2007-06-23 13:32 ` [patch -mm 28/28] x86_64: enable high resolution timers and dynticks Thomas Gleixner
2007-06-28 9:42 ` [patch-mm 00/28] High resolution timer updates and x86_64 support - V3 Andrew Morton
2007-06-28 9:47 ` Andi Kleen
2007-06-28 10:39 ` Andrew Morton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070623124031.210773624@inhelltoy.tec.linutronix.de \
--to=tglx@linutronix.de \
--cc=ak@suse.de \
--cc=akpm@linux-foundation.org \
--cc=arjan@infradead.org \
--cc=chrisw@sous-sol.org \
--cc=johnstul@us.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=sebastien.dugue@bull.net \
--cc=venkatesh.pallipadi@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).