* [PATCH] x86/hpet: fix copy-and-paste mistake in earlier change
@ 2012-05-25 10:40 Jan Beulich
2012-05-25 13:37 ` [tip:x86/urgent] x86: hpet: Fix " tip-bot for Jan Beulich
0 siblings, 1 reply; 2+ messages in thread
From: Jan Beulich @ 2012-05-25 10:40 UTC (permalink / raw)
To: mingo, tglx, hpa; +Cc: linux-kernel
This fixes an oversight in 396e2c6fed4ff13b53ce0e573105531cf53b0cad
("x86: Clear HPET configuration registers on startup"), noticed by
Thomas Gleixner.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- tip.orig/arch/x86/kernel/hpet.c
+++ tip/arch/x86/kernel/hpet.c
@@ -870,7 +870,7 @@ int __init hpet_enable(void)
else
pr_warn("HPET initial state will not be saved\n");
cfg &= ~(HPET_CFG_ENABLE | HPET_CFG_LEGACY);
- hpet_writel(cfg, HPET_Tn_CFG(i));
+ hpet_writel(cfg, HPET_CFG);
if (cfg)
pr_warn("HPET: Unrecognized bits %#x set in global cfg\n",
cfg);
^ permalink raw reply [flat|nested] 2+ messages in thread* [tip:x86/urgent] x86: hpet: Fix copy-and-paste mistake in earlier change
2012-05-25 10:40 [PATCH] x86/hpet: fix copy-and-paste mistake in earlier change Jan Beulich
@ 2012-05-25 13:37 ` tip-bot for Jan Beulich
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Jan Beulich @ 2012-05-25 13:37 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, jbeulich, JBeulich, tglx
Commit-ID: 1b38a3a10f2ad96a3c0130f63b7f3610bab7090d
Gitweb: http://git.kernel.org/tip/1b38a3a10f2ad96a3c0130f63b7f3610bab7090d
Author: Jan Beulich <JBeulich@suse.com>
AuthorDate: Fri, 25 May 2012 11:40:09 +0100
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Fri, 25 May 2012 15:32:29 +0200
x86: hpet: Fix copy-and-paste mistake in earlier change
This fixes an oversight in 396e2c6fed4ff13b53ce0e573105531cf53b0cad
("x86: Clear HPET configuration registers on startup"), noticed by
Thomas Gleixner.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Link: http://lkml.kernel.org/r/4FBF7DA902000078000861EE@nat28.tlf.novell.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/x86/kernel/hpet.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 9cc7b43..1460a5d 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -870,7 +870,7 @@ int __init hpet_enable(void)
else
pr_warn("HPET initial state will not be saved\n");
cfg &= ~(HPET_CFG_ENABLE | HPET_CFG_LEGACY);
- hpet_writel(cfg, HPET_Tn_CFG(i));
+ hpet_writel(cfg, HPET_CFG);
if (cfg)
pr_warn("HPET: Unrecognized bits %#x set in global cfg\n",
cfg);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-05-25 13:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-05-25 10:40 [PATCH] x86/hpet: fix copy-and-paste mistake in earlier change Jan Beulich
2012-05-25 13:37 ` [tip:x86/urgent] x86: hpet: Fix " tip-bot for Jan Beulich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®