From ebde109fb5d0e028d7910b519399ded8b7417d18 Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg@redhat.com>
Date: Thu, 26 Jul 2012 18:00:00 -0400
Subject: [PATCH] --- yaml --- r: 323983 b: refs/heads/master c:
 9dead5bbb825d7c25c0400e61de83075046322d0 h: refs/heads/master i:   323981:
 6987cde31903dbd9b80704671c5655dbb26b8712   323979:
 91403f30631f28e44c0c164b8a78637f6e939f13   323975:
 20e4e0fe132b65b582aed63b1347b7d754a725b1   323967:
 7438258a8fcb87e6e4d2f0254055510c5a09938c v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/x86/boot/compressed/Makefile | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f094821ffe24..9948fa44e225 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38cb5ef4473c6f510fae3a00bdac3acd550e3796
+refs/heads/master: 9dead5bbb825d7c25c0400e61de83075046322d0
diff --git a/trunk/arch/x86/boot/compressed/Makefile b/trunk/arch/x86/boot/compressed/Makefile
index e398bb5d63bb..8a84501acb1b 100644
--- a/trunk/arch/x86/boot/compressed/Makefile
+++ b/trunk/arch/x86/boot/compressed/Makefile
@@ -28,6 +28,9 @@ VMLINUX_OBJS = $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o \
 	$(obj)/string.o $(obj)/cmdline.o $(obj)/early_serial_console.o \
 	$(obj)/piggy.o
 
+$(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone
+$(obj)/efi_stub_$(BITS).o: KBUILD_CLFAGS += -fshort-wchar -mno-red-zone
+
 ifeq ($(CONFIG_EFI_STUB), y)
 	VMLINUX_OBJS += $(obj)/eboot.o $(obj)/efi_stub_$(BITS).o
 endif