From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: stable-review@kernel.org, torvalds@linux-foundation.org,
akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk,
Cyrill Gorcunov <gorcunov@openvz.org>,
Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>,
Ingo Molnar <mingo@elte.hu>
Subject: [07/30] x86, mce: Thermal monitoring depends on APIC being enabled
Date: Wed, 20 Jan 2010 20:15:28 -0800 [thread overview]
Message-ID: <20100121041833.378521195@mini.kroah.org> (raw)
In-Reply-To: <20100121041852.GA9656@kroah.com>
2.6.32-stable review patch. If anyone has any objections, please let us know.
------------------
From: Cyrill Gorcunov <gorcunov@openvz.org>
commit 485a2e1973fd9f98c2c6776e66ac4721882b69e0 upstream.
Add check if APIC is not disabled since thermal
monitoring depends on it. As only apic gets disabled
we should not try to install "thermal monitor" vector,
print out that thermal monitoring is enabled and etc...
Note that "Intel Correct Machine Check Interrupts" already
has such a check.
Also I decided to not add cpu_has_apic check into
mcheck_intel_therm_init since even if it'll call apic_read on
disabled apic -- it's safe here and allow us to save a few code
bytes.
Reported-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
LKML-Reference: <4B25FDC2.3020401@jp.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
arch/x86/kernel/cpu/mcheck/therm_throt.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- a/arch/x86/kernel/cpu/mcheck/therm_throt.c
+++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c
@@ -274,8 +274,9 @@ void intel_init_thermal(struct cpuinfo_x
int tm2 = 0;
u32 l, h;
- /* Thermal monitoring depends on ACPI and clock modulation*/
- if (!cpu_has(c, X86_FEATURE_ACPI) || !cpu_has(c, X86_FEATURE_ACC))
+ /* Thermal monitoring depends on APIC, ACPI and clock modulation */
+ if (!cpu_has_apic || !cpu_has(c, X86_FEATURE_ACPI) ||
+ !cpu_has(c, X86_FEATURE_ACC))
return;
/*
next prev parent reply other threads:[~2010-01-21 4:29 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-21 4:18 [00/30] 2.6.32.5 review Greg KH
2010-01-21 4:15 ` [01/30] inotify: do not reuse watch descriptors Greg KH
2010-01-21 4:15 ` [02/30] inotify: only warn once for inotify problems Greg KH
2010-01-21 4:15 ` [03/30] revert "drivers/video/s3c-fb.c: fix clock setting for Samsung SoC Framebuffer" Greg KH
2010-01-21 4:15 ` [04/30] memcg: ensure list is empty at rmdir Greg KH
2010-01-21 4:15 ` [05/30] drm/i915: remove loop in Ironlake interrupt handler Greg KH
2010-01-21 4:15 ` [06/30] block: Fix incorrect reporting of partition alignment Greg KH
2010-01-21 4:15 ` Greg KH [this message]
2010-01-21 4:15 ` [08/30] futexes: Remove rw parameter from get_futex_key() Greg KH
2010-01-21 4:15 ` [09/30] page allocator: update NR_FREE_PAGES only when necessary Greg KH
2010-01-21 4:15 ` [10/30] x86, apic: use physical mode for IBM summit platforms Greg KH
2010-01-21 4:15 ` [11/30] edac: i5000_edac critical fix panic out of bounds Greg KH
2010-01-21 4:15 ` [12/30] x86: SGI UV: Fix mapping of MMIO registers Greg KH
2010-01-21 4:15 ` [13/30] mfd: WM835x GPIO direction register is not locked Greg KH
2010-01-21 4:15 ` [14/30] mfd: Correct WM835x ISINK ramp time defines Greg KH
2010-01-21 4:15 ` [15/30] ALSA: hda - Fix missing capture mixer for ALC861/660 codecs Greg KH
2010-01-21 4:15 ` [16/30] V4L/DVB (13868): gspca - sn9c20x: Fix test of unsigned Greg KH
2010-01-21 4:15 ` [17/30] reiserfs: truncate blocks not used by a write Greg KH
2010-01-21 4:15 ` [18/30] HID: add device IDs for new model of Apple Wireless Keyboard Greg KH
2010-01-21 4:15 ` [19/30] PCI/cardbus: Add a fixup hook and fix powerpc Greg KH
2010-01-21 4:15 ` [20/30] [SCSI] megaraid_sas: remove sysfs poll_mode_io world writeable permissions Greg KH
2010-01-21 4:15 ` [21/30] Input: pmouse - move Sentelic probe down the list Greg KH
2010-01-21 4:15 ` [22/30] asus-laptop: add Lenovo SL hotkey support Greg KH
2010-01-21 4:15 ` [23/30] sched: Fix cpu_clock() in NMIs, on !CONFIG_HAVE_UNSTABLE_SCHED_CLOCK Greg KH
2010-01-21 4:15 ` [24/30] sparc64: Fix NMI programming when perf events are active Greg KH
2010-01-21 4:15 ` [25/30] sparc64: Fix Niagara2 perf event handling Greg KH
2010-01-21 4:15 ` [26/30] i2c: Do not use device name after device_unregister Greg KH
2010-01-21 4:15 ` [27/30] i2c/pca: Dont use *_interruptible Greg KH
2010-01-21 4:15 ` [28/30] serial/8250_pnp: add a new Fujitsu Wacom Tablet PC device Greg KH
2010-01-21 4:15 ` [29/30] sched: Fix task priority bug Greg KH
2010-01-21 4:15 ` [30/30] vfs: Fix vmtruncate() regression Greg KH
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=20100121041833.378521195@mini.kroah.org \
--to=gregkh@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=gorcunov@openvz.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=seto.hidetoshi@jp.fujitsu.com \
--cc=stable-review@kernel.org \
--cc=stable@kernel.org \
--cc=torvalds@linux-foundation.org \
/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
all inboxes | Powered by JetHome®