Subject: [merged] x86-fix-boot-on-uniprocessor-systems.patch removed from -mm tree
To: artem_fetishev@xxxxxxxx,a.p.zijlstra@xxxxxxxxx,eranian@xxxxxxxxxx,hpa@xxxxxxxxx,mingo@xxxxxxx,stable@xxxxxxxxxxxxxxx,tglx@xxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Mon, 31 Mar 2014 11:21:19 -0700
The patch titled
Subject: x86: fix boot on uniprocessor systems
has been removed from the -mm tree. Its filename was
x86-fix-boot-on-uniprocessor-systems.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Artem Fetishev <artem_fetishev@xxxxxxxx>
Subject: 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@xxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/include/asm/topology.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN arch/x86/include/asm/topology.h~x86-fix-boot-on-uniprocessor-systems arch/x86/include/asm/topology.h
--- a/arch/x86/include/asm/topology.h~x86-fix-boot-on-uniprocessor-systems
+++ a/arch/x86/include/asm/topology.h
@@ -119,9 +119,10 @@ static inline void setup_node_to_cpumask
extern const struct cpumask *cpu_coregroup_mask(int cpu);
-#ifdef ENABLE_TOPO_DEFINES
#define topology_physical_package_id(cpu) (cpu_data(cpu).phys_proc_id)
#define topology_core_id(cpu) (cpu_data(cpu).cpu_core_id)
+
+#ifdef ENABLE_TOPO_DEFINES
#define topology_core_cpumask(cpu) (per_cpu(cpu_core_map, cpu))
#define topology_thread_cpumask(cpu) (per_cpu(cpu_sibling_map, cpu))
#endif
_
Patches currently in -mm which might be from artem_fetishev@xxxxxxxx are
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html