From 5f9d74fbdef69f49cba3f1ff838a23d76921c60e Mon Sep 17 00:00:00 2001
From: Max Filippov <jcmvbkbc@gmail.com>
Date: Mon, 17 Sep 2012 05:44:31 +0400
Subject: [PATCH] --- yaml --- r: 332301 b: refs/heads/master c:
 f6a03a12ecdbe0dd80a55f6df3b7206c5a403a49 h: refs/heads/master i:   332299:
 d649210568a50561806238948fda2b701d8af40d v: v3

---
 [refs]                            | 2 +-
 trunk/arch/xtensa/kernel/Makefile | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 13859ba9fb63..ff273063ad64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f959ed2fdb92f2e96ae6ebd547e0d418be686a2b
+refs/heads/master: f6a03a12ecdbe0dd80a55f6df3b7206c5a403a49
diff --git a/trunk/arch/xtensa/kernel/Makefile b/trunk/arch/xtensa/kernel/Makefile
index 59fc3fe15572..0f9f35fc191a 100644
--- a/trunk/arch/xtensa/kernel/Makefile
+++ b/trunk/arch/xtensa/kernel/Makefile
@@ -24,6 +24,7 @@ obj-$(CONFIG_MODULES) += xtensa_ksyms.o module.o
 # Replicate rules in scripts/Makefile.build
 
 sed-y = -e 's/\*(\(\.[a-z]*it\|\.ref\|\)\.text)/*(\1.literal \1.text)/g'    \
+	-e 's/\.text\.unlikely/.literal.unlikely .text.unlikely/g' \
 	-e 's/\*(\(\.text\.[a-z]*\))/*(\1.literal \1)/g'
 
 quiet_cmd__cpp_lds_S = LDS     $@