diff --git a/[refs] b/[refs]
index 91eeae8f60ad..79a42264e128 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02b25d811f949fc70badd6535dfaf13a3c5decf9
+refs/heads/master: 6550162200b40d1e725167f8a617255c42b57552
diff --git a/trunk/arch/xtensa/Kconfig.debug b/trunk/arch/xtensa/Kconfig.debug
index 11c585295dd7..be5fb4c6243f 100644
--- a/trunk/arch/xtensa/Kconfig.debug
+++ b/trunk/arch/xtensa/Kconfig.debug
@@ -2,6 +2,15 @@ menu "Kernel hacking"
 
 source "lib/Kconfig.debug"
 
-endmenu
-
+config LD_NO_RELAX
+	bool "Disable linker relaxation"
+	default n
+	help
+	  Enable this function to disable link-time optimizations.
+	  The default linker behavior is to combine identical literal
+	  values to reduce code size and remove unnecessary overhead from
+	  assembler-generated 'longcall' sequences.
+	  Enabling this option improves the link time but increases the
+	  code size, and possibly execution time.
 
+endmenu
diff --git a/trunk/arch/xtensa/Makefile b/trunk/arch/xtensa/Makefile
index bb5ba61723f7..ab63c9beb930 100644
--- a/trunk/arch/xtensa/Makefile
+++ b/trunk/arch/xtensa/Makefile
@@ -49,6 +49,10 @@ KBUILD_CFLAGS += -pipe -mlongcalls
 
 KBUILD_CFLAGS += $(call cc-option,-mforce-no-pic,)
 
+ifneq ($(CONFIG_LD_NO_RELAX),)
+LDFLAGS := --no-relax
+endif
+
 vardirs := $(patsubst %,arch/xtensa/variants/%/,$(variant-y))
 plfdirs := $(patsubst %,arch/xtensa/platforms/%/,$(platform-y))