diff options
| author | Josh Triplett <josh@joshtriplett.org> | 2014-03-10 13:11:26 -0700 |
|---|---|---|
| committer | Josh Triplett <josh@joshtriplett.org> | 2014-08-17 14:58:24 -0700 |
| commit | 9e6abd2a98ca599e0efb8c46acc17f17dc1a6fe9 (patch) | |
| tree | fe4e6b44df6be66c40bf0fda83b4a2a5c5e928a9 /arch/x86/boot/compressed | |
| parent | 9a1cb47112eff140659f04c261ca19fb1f002607 (diff) | |
| download | linux-stable-9e6abd2a98ca599e0efb8c46acc17f17dc1a6fe9.tar.gz linux-stable-9e6abd2a98ca599e0efb8c46acc17f17dc1a6fe9.tar.bz2 linux-stable-9e6abd2a98ca599e0efb8c46acc17f17dc1a6fe9.zip | |
x86, boot: Don't compile aslr.c when !CONFIG_RANDOMIZE_BASE
All the code in aslr.c gets compiled out if !CONFIG_RANDOMIZE_BASE, but
aslr.o itself still gets compiled in. Eliminate it from the compile
entirely in that case.
This does not change the generated code at all, in either case.
Signed-off-by: Josh Triplett <josh@joshtriplett.org>
Diffstat (limited to 'arch/x86/boot/compressed')
| -rw-r--r-- | arch/x86/boot/compressed/Makefile | 4 | ||||
| -rw-r--r-- | arch/x86/boot/compressed/aslr.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile index 80709a98cc9c..3b9b00c68fd8 100644 --- a/arch/x86/boot/compressed/Makefile +++ b/arch/x86/boot/compressed/Makefile @@ -28,7 +28,9 @@ HOST_EXTRACFLAGS += -I$(srctree)/tools/include vmlinux-objs-y := $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o \ $(obj)/string.o $(obj)/cmdline.o $(obj)/early_serial_console.o \ - $(obj)/piggy.o $(obj)/cpuflags.o $(obj)/aslr.o + $(obj)/piggy.o $(obj)/cpuflags.o + +vmlinux-objs-$(CONFIG_RANDOMIZE_BASE) += $(obj)/aslr.o $(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone diff --git a/arch/x86/boot/compressed/aslr.c b/arch/x86/boot/compressed/aslr.c index fc6091abedb7..913c999b0045 100644 --- 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> @@ -320,5 +319,3 @@ unsigned char *choose_kernel_location(unsigned char *input, out: return (unsigned char *)choice; } - -#endif /* CONFIG_RANDOMIZE_BASE */ |