diff options
author | Paul Bolle <pebolle@tiscali.nl> | 2016-11-03 04:53:50 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2016-12-14 04:54:28 -0500 |
commit | 846221cfb8f64c613b7635c94e0c02549a666c14 (patch) | |
tree | ca22dfd6f341c5b3de6e96d84b75bbe478dd344b | |
parent | d06505b2a95efba25dc635b64a481e3197e9369a (diff) |
Remove references to dead make variable LINUX_INCLUDE
Commit 4fd06960f120 ("Use the new x86 setup code for i386") introduced a
reference to the make variable LINUX_INCLUDE. That reference got moved
around a bit and copied twice and now there are three references to it.
There has never been a definition of that variable. (Presumably that is
because it started out as a mistyped reference to LINUXINCLUDE.) So this
reference has always been an empty string. Let's remove it before it
spreads any further.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r-- | arch/s390/boot/compressed/Makefile | 2 | ||||
-rw-r--r-- | arch/x86/boot/compressed/Makefile | 2 | ||||
-rw-r--r-- | drivers/firmware/efi/libstub/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/boot/compressed/Makefile b/arch/s390/boot/compressed/Makefile index 0daa070d6c9d..6bd2c9022be3 100644 --- a/arch/s390/boot/compressed/Makefile +++ b/arch/s390/boot/compressed/Makefile | |||
@@ -10,7 +10,7 @@ targets := vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 | |||
10 | targets += vmlinux.bin.xz vmlinux.bin.lzma vmlinux.bin.lzo vmlinux.bin.lz4 | 10 | targets += vmlinux.bin.xz vmlinux.bin.lzma vmlinux.bin.lzo vmlinux.bin.lz4 |
11 | targets += misc.o piggy.o sizes.h head.o | 11 | targets += misc.o piggy.o sizes.h head.o |
12 | 12 | ||
13 | KBUILD_CFLAGS := -m64 -D__KERNEL__ $(LINUX_INCLUDE) -O2 | 13 | KBUILD_CFLAGS := -m64 -D__KERNEL__ -O2 |
14 | KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING | 14 | KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING |
15 | KBUILD_CFLAGS += $(cflags-y) -fno-delete-null-pointer-checks -msoft-float | 15 | KBUILD_CFLAGS += $(cflags-y) -fno-delete-null-pointer-checks -msoft-float |
16 | KBUILD_CFLAGS += $(call cc-option,-mpacked-stack) | 16 | KBUILD_CFLAGS += $(call cc-option,-mpacked-stack) |
diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile index 34d9e15857c3..44163e8c3868 100644 --- a/arch/x86/boot/compressed/Makefile +++ b/arch/x86/boot/compressed/Makefile | |||
@@ -25,7 +25,7 @@ KCOV_INSTRUMENT := n | |||
25 | targets := vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma \ | 25 | targets := vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma \ |
26 | vmlinux.bin.xz vmlinux.bin.lzo vmlinux.bin.lz4 | 26 | vmlinux.bin.xz vmlinux.bin.lzo vmlinux.bin.lz4 |
27 | 27 | ||
28 | KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2 | 28 | KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ -O2 |
29 | KBUILD_CFLAGS += -fno-strict-aliasing $(call cc-option, -fPIE, -fPIC) | 29 | KBUILD_CFLAGS += -fno-strict-aliasing $(call cc-option, -fPIE, -fPIC) |
30 | KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING | 30 | KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING |
31 | cflags-$(CONFIG_X86_32) := -march=i386 | 31 | cflags-$(CONFIG_X86_32) := -march=i386 |
diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/libstub/Makefile index 5e23e2d305e7..25a86e78683d 100644 --- a/drivers/firmware/efi/libstub/Makefile +++ b/drivers/firmware/efi/libstub/Makefile | |||
@@ -6,7 +6,7 @@ | |||
6 | # | 6 | # |
7 | cflags-$(CONFIG_X86_32) := -march=i386 | 7 | cflags-$(CONFIG_X86_32) := -march=i386 |
8 | cflags-$(CONFIG_X86_64) := -mcmodel=small | 8 | cflags-$(CONFIG_X86_64) := -mcmodel=small |
9 | cflags-$(CONFIG_X86) += -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2 \ | 9 | cflags-$(CONFIG_X86) += -m$(BITS) -D__KERNEL__ -O2 \ |
10 | -fPIC -fno-strict-aliasing -mno-red-zone \ | 10 | -fPIC -fno-strict-aliasing -mno-red-zone \ |
11 | -mno-mmx -mno-sse | 11 | -mno-mmx -mno-sse |
12 | 12 | ||