Merge tag 'v3.19-rc6' into devel

Linux 3.19-rc6

1 files changed, 8 insertions, 1 deletions

diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
index dcc1c536cc21..a950864a64da 100644
--- a/arch/x86/boot/compressed/misc.c
+++ b/arch/x86/boot/compressed/misc.c
@@ -373,6 +373,8 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap,
                                   unsigned long output_len,
                                   unsigned long run_size)
 {
+        unsigned char *output_orig = output;
+
         real_mode = rmode;
 
         sanitize_boot_params(real_mode);
@@ -421,7 +423,12 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap,
         debug_putstr("\nDecompressing Linux... ");
         decompress(input_data, input_len, NULL, NULL, output, NULL, error);
         parse_elf(output);
-        handle_relocations(output, output_len);
+        /*
+         * 32-bit always performs relocations. 64-bit relocations are only
+         * needed if kASLR has chosen a different load address.
+         */
+        if (!IS_ENABLED(CONFIG_X86_64) || output != output_orig)
+                handle_relocations(output, output_len);
         debug_putstr("done.\nBooting the kernel.\n");
         return output;
 }