git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
boot
/
compressed
/
aslr.c
diff --git
a/arch/x86/boot/compressed/aslr.c
b/arch/x86/boot/compressed/aslr.c
index d39189ba7f8e5f03397599814ae22f7f79d7a03a..7c68808edeb7070be08d195fafd35b502fef027f 100644
(file)
--- a/
arch/x86/boot/compressed/aslr.c
+++ b/
arch/x86/boot/compressed/aslr.c
@@
-1,6
+1,5
@@
#include "misc.h"
-#ifdef CONFIG_RANDOMIZE_BASE
#include <asm/msr.h>
#include <asm/archrandom.h>
#include <asm/e820.h>
@@
-335,5
+334,3
@@
unsigned char *choose_kernel_location(unsigned char *input,
out:
return (unsigned char *)choice;
}
-
-#endif /* CONFIG_RANDOMIZE_BASE */