diff --git a/[refs] b/[refs]
index 165c3c0df837..90bf0c3b5c57 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d25dc7fd4740decf4c66e2f17dbaa288448fabd5
+refs/heads/master: bef5b54bd7bf8117c75cb943d64549134c6d9a1f
diff --git a/trunk/Makefile b/trunk/Makefile
index 8a2a275be304..1564577bdc53 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -508,6 +508,8 @@ else
 KBUILD_CFLAGS	+= -O2
 endif
 
+include $(srctree)/arch/$(SRCARCH)/Makefile
+
 ifneq (CONFIG_FRAME_WARN,0)
 KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN})
 endif
@@ -516,8 +518,6 @@ endif
 # Arch Makefiles may override this setting
 KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector)
 
-include $(srctree)/arch/$(SRCARCH)/Makefile
-
 ifdef CONFIG_FRAME_POINTER
 KBUILD_CFLAGS	+= -fno-omit-frame-pointer -fno-optimize-sibling-calls
 else