From: Cyrill Gorcunov <gorcunov@gmail.com>
To: mingo@elte.hu, hpa@zytor.com, tglx@linutronix.de,
macro@linux-mips.org, linux-kernel@vger.kernel.org
Cc: Cyrill Gorcunov <gorcunov@gmail.com>
Subject: [PATCH 3/6] x86: apic - unify lapic_suspend
Date: Sat, 16 Aug 2008 23:21:52 +0400 [thread overview]
Message-ID: <7bef3d3fb91a430ad3a461f59c8a5140fa1e9d87.1218914042.git.gorcunov@gmail.com> (raw)
In-Reply-To: <722b5bc0303212ca203cadeedae5ede3e23eccb7.1218914042.git.gorcunov@gmail.com>
In-Reply-To: <f87881899957b7aa08b827cdc6b5dd8cf53e4730.1218914042.git.gorcunov@gmail.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
arch/x86/kernel/apic_32.c | 2 +-
arch/x86/kernel/apic_64.c | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index 3d40213..6cb8aaa 100644
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -1582,7 +1582,7 @@ static int lapic_suspend(struct sys_device *dev, pm_message_t state)
apic_pm_state.apic_lvterr = apic_read(APIC_LVTERR);
apic_pm_state.apic_tmict = apic_read(APIC_TMICT);
apic_pm_state.apic_tdcr = apic_read(APIC_TDCR);
-#ifdef CONFIG_X86_MCE_P4THERMAL
+#if defined(CONFIG_X86_MCE_P4THERMAL) || defined(CONFIG_X86_MCE_INTEL)
if (maxlvt >= 5)
apic_pm_state.apic_thmr = apic_read(APIC_LVTTHMR);
#endif
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index e542a2d..13dea93 100644
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -1390,10 +1390,11 @@ static int lapic_suspend(struct sys_device *dev, pm_message_t state)
apic_pm_state.apic_lvterr = apic_read(APIC_LVTERR);
apic_pm_state.apic_tmict = apic_read(APIC_TMICT);
apic_pm_state.apic_tdcr = apic_read(APIC_TDCR);
-#ifdef CONFIG_X86_MCE_INTEL
+#if defined(CONFIG_X86_MCE_P4THERMAL) || defined(CONFIG_X86_MCE_INTEL)
if (maxlvt >= 5)
apic_pm_state.apic_thmr = apic_read(APIC_LVTTHMR);
#endif
+
local_irq_save(flags);
disable_local_APIC();
local_irq_restore(flags);
--
1.6.0.rc1.34.g0fe8c
next prev parent reply other threads:[~2008-08-16 19:22 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-16 19:21 one more apic merging preliminary series Cyrill Gorcunov
2008-08-16 19:21 ` [PATCH 1/6] x86: apic - unify clear_local_APIC Cyrill Gorcunov
2008-08-16 19:21 ` [PATCH 2/6] x86: apic - unify lapic_resume Cyrill Gorcunov
2008-08-16 19:21 ` Cyrill Gorcunov [this message]
2008-08-16 19:21 ` [PATCH 4/6] x86: apic - rearrange functions and comments Cyrill Gorcunov
2008-08-16 19:21 ` [PATCH 5/6] x86: apic - unify lapic_is_integrated Cyrill Gorcunov
2008-08-16 19:21 ` [PATCH 6/6] x86: apic - unify xapic_icr_read Cyrill Gorcunov
2008-08-16 19:52 ` [PATCH 2/6] x86: apic - unify lapic_resume Maciej W. Rozycki
2008-08-16 20:00 ` Arjan van de Ven
2008-08-16 20:12 ` Cyrill Gorcunov
2008-08-18 14:19 ` Maciej W. Rozycki
2008-08-18 14:39 ` Cyrill Gorcunov
2008-08-16 20:25 ` Maciej W. Rozycki
2008-08-16 20:05 ` Cyrill Gorcunov
2008-08-17 12:45 ` one more apic merging preliminary series Ingo Molnar
2008-08-17 13:12 ` Cyrill Gorcunov
2008-08-18 20:37 ` Suresh Siddha
2008-08-19 0:21 ` Ingo Molnar
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=7bef3d3fb91a430ad3a461f59c8a5140fa1e9d87.1218914042.git.gorcunov@gmail.com \
--to=gorcunov@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=macro@linux-mips.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
/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).