[kernel] r16842 - in dists/trunk/linux-2.6/debian: . patches/bugfix/sh4 patches/series

[Aurelien Jarno]

Author: aurel32
Date: Thu Jan 20 09:28:20 2011
New Revision: 16842

Log:
* [sh4] Export cpu_core_map to fix build failure with CONFIG_SFC=m.

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/sh4/sh-export-topology-core-cpumask.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.2

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Thu Jan 20 06:49:50 2011	(r16841)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Jan 20 09:28:20 2011	(r16842)
@@ -4,6 +4,9 @@
   * [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 <ben at decadent.org.uk>  Mon, 10 Jan 2011 00:39:29 +0000
 
 linux-2.6 (2.6.37-1~experimental.1) experimental; urgency=low

Added: dists/trunk/linux-2.6/debian/patches/bugfix/sh4/sh-export-topology-core-cpumask.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/sh4/sh-export-topology-core-cpumask.patch	Thu Jan 20 09:28:20 2011	(r16842)
@@ -0,0 +1,30 @@
+From 24ee7d79c5885275a531431c3b687b3a7919eee4 Mon Sep 17 00:00:00 2001
+From: Aurelien Jarno <aurelien at aurel32.net>
+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 <aurelien at aurel32.net>
+Signed-off-by: Paul Mundt <lethal at linux-sh.org>
+---
+ 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
+

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.2
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.2	Thu Jan 20 06:49:50 2011	(r16841)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.2	Thu Jan 20 09:28:20 2011	(r16842)
@@ -1 +1,2 @@
 - bugfix/arm/ixp4xx-add-missing-export.patch
++ bugfix/sh4/sh-export-topology-core-cpumask.patch