From 96c69282fcff8c6589a7f6330db45cf6a60f8842 Mon Sep 17 00:00:00 2001
From: Jon Masters <jcm@redhat.com>
Date: Sat, 24 Mar 2012 22:43:37 -0400
Subject: [PATCH] kallsyms: Temporary fix for kallsyms on !CONFIG_SMP

Corrects a problem with kallsyms while discussing upstream.

Signed-off-by: Jon Masters <jcm@redhat.com>
---
 arm-nosmp-fix-per_cpu-data-type-kallsyms.patch | 12 ++++++++++++
 kernel.spec                                    |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 arm-nosmp-fix-per_cpu-data-type-kallsyms.patch

diff --git a/arm-nosmp-fix-per_cpu-data-type-kallsyms.patch b/arm-nosmp-fix-per_cpu-data-type-kallsyms.patch
new file mode 100644
index 000000000..e5dde585e
--- /dev/null
+++ b/arm-nosmp-fix-per_cpu-data-type-kallsyms.patch
@@ -0,0 +1,12 @@
+--- linux-3.3.0-0.rc6.git2.3.fc15.armv7hl_percpu_problem/arch/arm/kernel/vmlinux.lds.S	2012-03-24 21:59:47.000000000 -0400
++++ linux-3.3.0-0.rc6.git2.3.fc15.armv7hl_test1/arch/arm/kernel/vmlinux.lds.S	2012-03-24 15:24:50.000000000 -0400
+@@ -183,7 +183,9 @@ SECTIONS
+ 	}
+ #endif
+ 
++#ifdef CONFIG_SMP
+ 	PERCPU_SECTION(L1_CACHE_BYTES)
++#endif
+ 
+ #ifdef CONFIG_XIP_KERNEL
+ 	__data_loc = ALIGN(4);		/* location in binary */
diff --git a/kernel.spec b/kernel.spec
index c8b13b4df..03e617ae5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -31,7 +31,7 @@ Summary: The Linux kernel
 #
 # (Uncomment the '#' and both spaces below to set the buildid.)
 #
-# % define buildid .local
+%define buildid .jcm1
 ###################################################################
 
 # The buildid can also be specified on the rpmbuild command line
@@ -727,6 +727,7 @@ Patch14010: lis3-improve-handling-of-null-rate.patch
 Patch21000: arm-omap-dt-compat.patch
 Patch21001: arm-smsc-support-reading-mac-address-from-device-tree.patch
 Patch21004: arm-tegra-nvec-kconfig.patch
+Patch21005: arm-nosmp-fix-per_cpu-data-type-kallsyms.patch
 
 # highbank patches
 # Highbank clock functions need to be EXPORT for module builds
@@ -1328,6 +1329,7 @@ ApplyPatch linux-2.6-i386-nx-emulation.patch
 #ApplyPatch arm-omap-dt-compat.patch
 #ApplyPatch arm-smsc-support-reading-mac-address-from-device-tree.patch
 ApplyPatch arm-tegra-nvec-kconfig.patch
+ApplyPatch arm-nosmp-fix-per_cpu-data-type-kallsyms.patch
 
 #
 # bugfixes to drivers and filesystems