* [PATCH] x86: Remove check for CONFIG_X86_MCE_P4THERMAL
@ 2013-05-29 18:57 Paul Bolle
2013-05-31 12:51 ` [tip:x86/cleanups] x86/mce: " tip-bot for Paul Bolle
0 siblings, 1 reply; 2+ messages in thread
From: Paul Bolle @ 2013-05-29 18:57 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin; +Cc: x86, linux-kernel
The Kconfig symbol X86_MCE_P4THERMAL was removed in v2.6.32. Remove a
useless check for its macro, as it will now always evaluate to false.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
Entirely untested.
arch/x86/kernel/apic/apic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 904611b..1600b1c 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -2302,7 +2302,7 @@ static void lapic_resume(void)
apic_write(APIC_SPIV, apic_pm_state.apic_spiv);
apic_write(APIC_LVT0, apic_pm_state.apic_lvt0);
apic_write(APIC_LVT1, apic_pm_state.apic_lvt1);
-#if defined(CONFIG_X86_MCE_P4THERMAL) || defined(CONFIG_X86_MCE_INTEL)
+#if defined(CONFIG_X86_MCE_INTEL)
if (maxlvt >= 5)
apic_write(APIC_LVTTHMR, apic_pm_state.apic_thmr);
#endif
--
1.7.11.7
^ permalink raw reply [flat|nested] 2+ messages in thread
* [tip:x86/cleanups] x86/mce: Remove check for CONFIG_X86_MCE_P4THERMAL
2013-05-29 18:57 [PATCH] x86: Remove check for CONFIG_X86_MCE_P4THERMAL Paul Bolle
@ 2013-05-31 12:51 ` tip-bot for Paul Bolle
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Paul Bolle @ 2013-05-31 12:51 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, pebolle, hpa, mingo, tglx
Commit-ID: 71c69f7f4b67150e10cdfcad217d464f1821b3c6
Gitweb: http://git.kernel.org/tip/71c69f7f4b67150e10cdfcad217d464f1821b3c6
Author: Paul Bolle <pebolle@tiscali.nl>
AuthorDate: Wed, 29 May 2013 20:57:30 +0200
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 31 May 2013 13:12:35 +0200
x86/mce: Remove check for CONFIG_X86_MCE_P4THERMAL
The Kconfig symbol X86_MCE_P4THERMAL was removed in v2.6.32.
Remove a useless check for its macro, as it will now always
evaluate to false.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Link: http://lkml.kernel.org/r/1369853850.23034.28.camel@x61.thuisdomein
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/kernel/apic/apic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 904611b..1600b1c 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -2302,7 +2302,7 @@ static void lapic_resume(void)
apic_write(APIC_SPIV, apic_pm_state.apic_spiv);
apic_write(APIC_LVT0, apic_pm_state.apic_lvt0);
apic_write(APIC_LVT1, apic_pm_state.apic_lvt1);
-#if defined(CONFIG_X86_MCE_P4THERMAL) || defined(CONFIG_X86_MCE_INTEL)
+#if defined(CONFIG_X86_MCE_INTEL)
if (maxlvt >= 5)
apic_write(APIC_LVTTHMR, apic_pm_state.apic_thmr);
#endif
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-05-31 12:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-05-29 18:57 [PATCH] x86: Remove check for CONFIG_X86_MCE_P4THERMAL Paul Bolle
2013-05-31 12:51 ` [tip:x86/cleanups] x86/mce: " tip-bot for Paul Bolle
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®