x86/mm/KASLR: Propagate KASLR status to kernel proper

[mirror_ubuntu-artful-kernel.git] / arch / x86 / boot / compressed / misc.h

diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h
index ee3576b2666b8139eedf25077ce769da10712c11..89dd0d78013aaff6c889340e0e3caceb4c8f8c88 100644 (file)
--- a/arch/x86/boot/compressed/misc.h
+++ b/arch/x86/boot/compressed/misc.h
@@ -57,7 +57,7 @@ int cmdline_find_option_bool(const char *option);
 
 #if CONFIG_RANDOMIZE_BASE
 /* aslr.c */
-unsigned char *choose_kernel_location(struct boot_params *params,
+unsigned char *choose_kernel_location(struct boot_params *boot_params,
                                      unsigned char *input,
                                      unsigned long input_size,
                                      unsigned char *output,
@@ -66,7 +66,7 @@ unsigned char *choose_kernel_location(struct boot_params *params,
 bool has_cpuflag(int flag);
 #else
 static inline
-unsigned char *choose_kernel_location(struct boot_params *params,
+unsigned char *choose_kernel_location(struct boot_params *boot_params,
                                      unsigned char *input,
                                      unsigned long input_size,
                                      unsigned char *output,