diff options
| author | Josh Triplett <josh@joshtriplett.org> | 2014-03-10 21:26:10 +0100 |
|---|---|---|
| committer | Josh Triplett <josh@joshtriplett.org> | 2014-08-17 23:58:24 +0200 |
| commit | 3afed06a355b5525d9a87bcb76567ef2e2e7b3a2 (patch) | |
| tree | 6f3521a41627db95cd9cccae44921bb26787ae35 /arch/x86/boot | |
| parent | x86, boot: Don't compile aslr.c when !CONFIG_RANDOMIZE_BASE (diff) | |
| download | linux-3afed06a355b5525d9a87bcb76567ef2e2e7b3a2.tar.xz linux-3afed06a355b5525d9a87bcb76567ef2e2e7b3a2.zip | |
x86, boot: Don't compile early_serial_console.c when !CONFIG_EARLY_PRINTK
All the code in early_serial_console.c gets compiled out if
!CONFIG_EARLY_PRINTK, but early_serial_console.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')
| -rw-r--r-- | arch/x86/boot/compressed/Makefile | 3 | ||||
| -rw-r--r-- | arch/x86/boot/compressed/early_serial_console.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile index 3b9b00c68fd8..20db5b3609de 100644 --- a/arch/x86/boot/compressed/Makefile +++ b/arch/x86/boot/compressed/Makefile @@ -27,9 +27,10 @@ hostprogs-y := mkpiggy 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)/string.o $(obj)/cmdline.o \ $(obj)/piggy.o $(obj)/cpuflags.o +vmlinux-objs-$(CONFIG_EARLY_PRINTK) += $(obj)/early_serial_console.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/early_serial_console.c b/arch/x86/boot/compressed/early_serial_console.c index d3d003cb5481..261e81fb9582 100644 --- a/arch/x86/boot/compressed/early_serial_console.c +++ b/arch/x86/boot/compressed/early_serial_console.c @@ -1,9 +1,5 @@ #include "misc.h" -#ifdef CONFIG_EARLY_PRINTK - int early_serial_base; #include "../early_serial_console.c" - -#endif |