x86: fix boot on uniprocessor systems
authorArtem Fetishev <artem_fetishev@epam.com>
Fri, 28 Mar 2014 20:33:39 +0000 (13:33 -0700)
committerJiri Slaby <jslaby@suse.cz>
Thu, 3 Apr 2014 08:32:28 +0000 (10:32 +0200)
commit2c611dc0ca77c8012fee6f33cf05040b16dbee38
tree4211cd8ee0eb07929c3f772cd768e84ff041e11b
parentc890d3e4ff2070295ebc7f9467cff1719820646d
x86: fix boot on uniprocessor systems

commit 825600c0f20e595daaa7a6dd8970f84fa2a2ee57 upstream.

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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
arch/x86/include/asm/topology.h