diff options
| author | Artem Fetishev <artem_fetishev@epam.com> | 2014-03-29 00:33:39 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-29 00:56:58 +0400 |
| commit | 825600c0f20e595daaa7a6dd8970f84fa2a2ee57 (patch) | |
| tree | ae739547c15bb979d412c6eced02796310b04afb /net/ethernet | |
| parent | d9060742fbf630fe31951dfc10b798deb2813f01 (diff) | |
| download | linux-825600c0f20e595daaa7a6dd8970f84fa2a2ee57.tar.xz | |
x86: fix boot on uniprocessor systems
On x86 uniprocessor systems topology_physical_package_id() returns -1
which causes rapl_cpu_prepare() to leave rapl_pmu variable uninitialized
which leads to GPF in rapl_pmu_init().
See arch/x86/kernel/cpu/perf_event_intel_rapl.c.
It turns out that physical_package_id and core_id can actually be
retreived for uniprocessor systems too. Enabling them also fixes
rapl_pmu code.
Signed-off-by: Artem Fetishev <artem_fetishev@epam.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net/ethernet')
0 files changed, 0 insertions, 0 deletions