summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorCesar Eduardo Barros <cesarb@cesarb.net>2012-10-27 20:34:15 -0200
committerMatt Fleming <matt.fleming@intel.com>2012-11-20 20:17:48 +0000
commitcaaa8c6339ccefee6e834c4a8b0bec7e721e7357 (patch)
tree8f5e93646681efcd3eb2b75876070c7b6151cc81 /arch
parent226f69a4b7ed1da248d653aa1535bad61ba5fa49 (diff)
downloadlinux-3.10-caaa8c6339ccefee6e834c4a8b0bec7e721e7357.tar.gz
linux-3.10-caaa8c6339ccefee6e834c4a8b0bec7e721e7357.tar.bz2
linux-3.10-caaa8c6339ccefee6e834c4a8b0bec7e721e7357.zip
x86: remove dummy long from EFI stub
Commit 2e064b1 (x86, efi: Fix issue of overlapping .reloc section for EFI_STUB) removed a dummy reloc added by commit 291f363 (x86, efi: EFI boot stub support), but forgot to remove the dummy long used by that reloc. Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> Tested-by: Lee G Rosenbaum <lee.g.rosenbaum@intel.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/boot/header.S3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
index 2a017441b8b..8c132a625b9 100644
--- a/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
@@ -476,6 +476,3 @@ die:
setup_corrupt:
.byte 7
.string "No setup signature found...\n"
-
- .data
-dummy: .long 0