From 42bb91d33346fbf10e22c4526da261192a576335 Mon Sep 17 00:00:00 2001
From: James Hogan <james@albanarts.com>
Date: Thu, 6 Sep 2012 22:11:25 +0100
Subject: [PATCH] --- yaml --- r: 322605 b: refs/heads/master c:
 6895f97e15895625e03c95df904d92befdac7118 h: refs/heads/master i:   322603:
 be56452fbe60b1974166f3edaa8442bca03e2869 v: v3

---
 [refs]                        | 2 +-
 trunk/arch/blackfin/Makefile  | 1 -
 trunk/scripts/link-vmlinux.sh | 7 ++++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1ab0e41d40c5..19bc882edb8b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50888469bda11bcff306893bbaff21f25894be0b
+refs/heads/master: 6895f97e15895625e03c95df904d92befdac7118
diff --git a/trunk/arch/blackfin/Makefile b/trunk/arch/blackfin/Makefile
index d3d7e64ca96d..66cf00095b84 100644
--- a/trunk/arch/blackfin/Makefile
+++ b/trunk/arch/blackfin/Makefile
@@ -20,7 +20,6 @@ endif
 KBUILD_AFLAGS           += $(call cc-option,-mno-fdpic)
 KBUILD_CFLAGS_MODULE    += -mlong-calls
 LDFLAGS                 += -m elf32bfin
-KALLSYMS         += --symbol-prefix=_
 
 KBUILD_DEFCONFIG := BF537-STAMP_defconfig
 
diff --git a/trunk/scripts/link-vmlinux.sh b/trunk/scripts/link-vmlinux.sh
index 4629038c9e5a..df48dda8a2da 100644
--- a/trunk/scripts/link-vmlinux.sh
+++ b/trunk/scripts/link-vmlinux.sh
@@ -74,8 +74,13 @@ kallsyms()
 	info KSYM ${2}
 	local kallsymopt;
 
+	if [ -n "${CONFIG_SYMBOL_PREFIX}" ]; then
+		kallsymopt="${kallsymopt} \
+			    --symbol-prefix=${CONFIG_SYMBOL_PREFIX}"
+	fi
+
 	if [ -n "${CONFIG_KALLSYMS_ALL}" ]; then
-		kallsymopt=--all-symbols
+		kallsymopt="${kallsymopt} --all-symbols"
 	fi
 
 	local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL}               \