From: Greg Kroah-Hartman Date: Wed, 24 Oct 2012 22:07:39 +0000 (-0700) Subject: remove efi patch from 3.4 and 3.6, it was applied already X-Git-Tag: v3.0.49~35 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=425c0f5c9a8faa467449cc9713b62c1d7fa49692;p=thirdparty%2Fkernel%2Fstable-queue.git remove efi patch from 3.4 and 3.6, it was applied already --- diff --git a/queue-3.4/efi-build-efi-stub-with-efi-appropriate-options.patch b/queue-3.4/efi-build-efi-stub-with-efi-appropriate-options.patch deleted file mode 100644 index f8617d5ecbb..00000000000 --- a/queue-3.4/efi-build-efi-stub-with-efi-appropriate-options.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9dead5bbb825d7c25c0400e61de83075046322d0 Mon Sep 17 00:00:00 2001 -From: Matthew Garrett -Date: Thu, 26 Jul 2012 18:00:00 -0400 -Subject: efi: Build EFI stub with EFI-appropriate options - -From: Matthew Garrett - -commit 9dead5bbb825d7c25c0400e61de83075046322d0 upstream. - -We can't assume the presence of the red zone while we're still in a boot -services environment, so we should build with -fno-red-zone to avoid -problems. Change the size of wchar at the same time to make string handling -simpler. - -Signed-off-by: Matthew Garrett -Signed-off-by: Matt Fleming -Cc: Daniel Vacek -Signed-off-by: Greg Kroah-Hartman - ---- - arch/x86/boot/compressed/Makefile | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/arch/x86/boot/compressed/Makefile -+++ b/arch/x86/boot/compressed/Makefile -@@ -31,6 +31,9 @@ VMLINUX_OBJS = $(obj)/vmlinux.lds $(obj) - $(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone - $(obj)/efi_stub_$(BITS).o: KBUILD_CLFAGS += -fshort-wchar -mno-red-zone - -+$(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 diff --git a/queue-3.4/series b/queue-3.4/series index 9cfe203733e..b517a643dba 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -15,6 +15,5 @@ xen-x86-don-t-corrupt-eip-when-returning-from-a-signal-handler.patch usb-cdc-acm-fix-pipe-type-of-write-endpoint.patch usb-acm-fix-the-computation-of-the-number-of-data-bits.patch usb-host-xhci-new-system-added-for-compliance-mode-patch-on-sn65lvpe502cp.patch -efi-build-efi-stub-with-efi-appropriate-options.patch usb-option-blacklist-net-interface-on-zte-devices.patch usb-option-add-more-zte-devices.patch diff --git a/queue-3.6/efi-build-efi-stub-with-efi-appropriate-options.patch b/queue-3.6/efi-build-efi-stub-with-efi-appropriate-options.patch deleted file mode 100644 index f8617d5ecbb..00000000000 --- a/queue-3.6/efi-build-efi-stub-with-efi-appropriate-options.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9dead5bbb825d7c25c0400e61de83075046322d0 Mon Sep 17 00:00:00 2001 -From: Matthew Garrett -Date: Thu, 26 Jul 2012 18:00:00 -0400 -Subject: efi: Build EFI stub with EFI-appropriate options - -From: Matthew Garrett - -commit 9dead5bbb825d7c25c0400e61de83075046322d0 upstream. - -We can't assume the presence of the red zone while we're still in a boot -services environment, so we should build with -fno-red-zone to avoid -problems. Change the size of wchar at the same time to make string handling -simpler. - -Signed-off-by: Matthew Garrett -Signed-off-by: Matt Fleming -Cc: Daniel Vacek -Signed-off-by: Greg Kroah-Hartman - ---- - arch/x86/boot/compressed/Makefile | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/arch/x86/boot/compressed/Makefile -+++ b/arch/x86/boot/compressed/Makefile -@@ -31,6 +31,9 @@ VMLINUX_OBJS = $(obj)/vmlinux.lds $(obj) - $(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone - $(obj)/efi_stub_$(BITS).o: KBUILD_CLFAGS += -fshort-wchar -mno-red-zone - -+$(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 diff --git a/queue-3.6/series b/queue-3.6/series index 7bf081d02b2..9048fb99d8a 100644 --- a/queue-3.6/series +++ b/queue-3.6/series @@ -40,7 +40,6 @@ usb-ti_usb_3410_5052-fix-port-data-memory-leak.patch usb-kl5kusb105-fix-port-data-memory-leak.patch usb-io_edgeport-fix-port-data-memory-leak.patch usb-keyspan_pda-fix-port-data-memory-leak.patch -efi-build-efi-stub-with-efi-appropriate-options.patch usb-option-blacklist-net-interface-on-zte-devices.patch usb-option-add-more-zte-devices.patch usb-dwc3-gadget-fix-endpoint-always-busy-bug.patch