diff --git a/[refs] b/[refs]
index 7cbc0abb9de4..70d550c4f22a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a54bb701c248d65f761d366f94f2809abdc39f04
+refs/heads/master: 437374e9a95062fe310b901e48585691edaf5dd0
diff --git a/trunk/arch/ppc/boot/Makefile b/trunk/arch/ppc/boot/Makefile
index 487dc66dcc74..500497e3c72d 100644
--- a/trunk/arch/ppc/boot/Makefile
+++ b/trunk/arch/ppc/boot/Makefile
@@ -13,6 +13,8 @@
 # modified by Cort (cort@cs.nmt.edu)
 #
 
+# KBUILD_CFLAGS used when building rest of boot (takes effect recursively)
+KBUILD_CFLAGS 	+= -fno-builtin -D__BOOTER__ -Iarch/$(ARCH)/boot/include
 HOSTCFLAGS	+= -Iarch/$(ARCH)/boot/include
 
 BOOT_TARGETS	= zImage zImage.initrd znetboot znetboot.initrd
diff --git a/trunk/arch/xtensa/boot/Makefile b/trunk/arch/xtensa/boot/Makefile
index 9c5185f605b6..40aa55b485be 100644
--- a/trunk/arch/xtensa/boot/Makefile
+++ b/trunk/arch/xtensa/boot/Makefile
@@ -8,7 +8,8 @@
 #
 
 
-EXTRA_CFLAGS	+= -fno-builtin -Iarch/$(ARCH)/boot/include
+# KBUILD_CFLAGS used when building rest of boot (takes effect recursively)
+KBUILD_CFLAGS	+= -fno-builtin -Iarch/$(ARCH)/boot/include
 HOSTFLAGS	+= -Iarch/$(ARCH)/boot/include
 
 BIG_ENDIAN	:= $(shell echo -e __XTENSA_EB__ | $(CC) -E - | grep -v "\#")