From c0b4964a0472ef45c0b0571c637676a5063d4d92 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Thu, 20 Jan 2011 09:28:20 +0000 Subject: [PATCH] * [sh4] Export cpu_core_map to fix build failure with CONFIG_SFC=m. svn path=/dists/trunk/linux-2.6/; revision=16842 --- debian/changelog | 3 ++ .../sh4/sh-export-topology-core-cpumask.patch | 30 +++++++++++++++++++ debian/patches/series/1~experimental.2 | 1 + 3 files changed, 34 insertions(+) create mode 100644 debian/patches/bugfix/sh4/sh-export-topology-core-cpumask.patch diff --git a/debian/changelog b/debian/changelog index 3a00aa8e4..002fb3c8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ linux-2.6 (2.6.37-1~experimental.2) UNRELEASED; urgency=low * [arm] ixp4xx: Revert build fix, now applied upstream which resulted in another build failure + [ Aurelien Jarno ] + * [sh4] Export cpu_core_map to fix build failure with CONFIG_SFC=m. + -- Ben Hutchings Mon, 10 Jan 2011 00:39:29 +0000 linux-2.6 (2.6.37-1~experimental.1) experimental; urgency=low diff --git a/debian/patches/bugfix/sh4/sh-export-topology-core-cpumask.patch b/debian/patches/bugfix/sh4/sh-export-topology-core-cpumask.patch new file mode 100644 index 000000000..676b7411b --- /dev/null +++ b/debian/patches/bugfix/sh4/sh-export-topology-core-cpumask.patch @@ -0,0 +1,30 @@ +From 24ee7d79c5885275a531431c3b687b3a7919eee4 Mon Sep 17 00:00:00 2001 +From: Aurelien Jarno +Date: Tue, 18 Jan 2011 20:55:34 +0000 +Subject: [PATCH] sh: Fix sh build failure when CONFIG_SFC=m + +CONFIG_SFC=m uses topology_core_cpumask() which, for sh, expects +cpu_core_map to be exported. It is not. This patch exports the needed +symbol. + +Signed-off-by: Aurelien Jarno +Signed-off-by: Paul Mundt +--- + arch/sh/kernel/topology.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/arch/sh/kernel/topology.c b/arch/sh/kernel/topology.c +index 948fdb6..38e8628 100644 +--- a/arch/sh/kernel/topology.c ++++ b/arch/sh/kernel/topology.c +@@ -17,6 +17,7 @@ + static DEFINE_PER_CPU(struct cpu, cpu_devices); + + cpumask_t cpu_core_map[NR_CPUS]; ++EXPORT_SYMBOL(cpu_core_map); + + static cpumask_t cpu_coregroup_map(unsigned int cpu) + { +-- +1.7.3.5 + diff --git a/debian/patches/series/1~experimental.2 b/debian/patches/series/1~experimental.2 index 6ac3398fc..1164c86f9 100644 --- a/debian/patches/series/1~experimental.2 +++ b/debian/patches/series/1~experimental.2 @@ -1 +1,2 @@ - bugfix/arm/ixp4xx-add-missing-export.patch ++ bugfix/sh4/sh-export-topology-core-cpumask.patch