x86/KASLR: Clarify identity map interface

[linux-2.6-microblaze.git] / arch / x86 / boot / compressed / kaslr.c

diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c
index cfeb025..54037c9 100644 (file)
--- a/arch/x86/boot/compressed/kaslr.c
+++ b/arch/x86/boot/compressed/kaslr.c
@@ -471,20 +471,16 @@ unsigned char *choose_random_location(unsigned long input,
        unsigned long choice = output;
        unsigned long random_addr;
 
-#ifdef CONFIG_HIBERNATION
-       if (!cmdline_find_option_bool("kaslr")) {
-               warn("KASLR disabled: 'kaslr' not on cmdline (hibernation selected).");
-               goto out;
-       }
-#else
        if (cmdline_find_option_bool("nokaslr")) {
                warn("KASLR disabled: 'nokaslr' on cmdline.");
                goto out;
        }
-#endif
 
        boot_params->hdr.loadflags |= KASLR_FLAG;
 
+       /* Prepare to add new identity pagetables on demand. */
+       initialize_identity_maps();
+
        /* Record the various known unsafe memory ranges. */
        mem_avoid_init(input, input_size, output);