diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-11-01 09:41:06 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-11-01 09:41:06 +0300 |
| commit | 05b93c19d50af2bd0d30fc000d817418ae8d33f1 (patch) | |
| tree | dbfbd3f3bc13789e6450112c2013d7a2b042bdb9 /arch/x86/entry | |
| parent | 24d86f59093b0bcb3756cdf47f2db10ff4e90dbb (diff) | |
| parent | 0c183d92b20b5c84ca655b45ef57b3318b83eb9e (diff) | |
| download | linux-05b93c19d50af2bd0d30fc000d817418ae8d33f1.tar.xz | |
Merge branch 'linus' into x86/asm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/entry')
| -rw-r--r-- | arch/x86/entry/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/entry/Makefile b/arch/x86/entry/Makefile index 77f28ce9c646..9976fcecd17e 100644 --- a/arch/x86/entry/Makefile +++ b/arch/x86/entry/Makefile @@ -5,8 +5,8 @@ OBJECT_FILES_NON_STANDARD_entry_$(BITS).o := y OBJECT_FILES_NON_STANDARD_entry_64_compat.o := y -CFLAGS_syscall_64.o += -Wno-override-init -CFLAGS_syscall_32.o += -Wno-override-init +CFLAGS_syscall_64.o += $(call cc-option,-Wno-override-init,) +CFLAGS_syscall_32.o += $(call cc-option,-Wno-override-init,) obj-y := entry_$(BITS).o thunk_$(BITS).o syscall_$(BITS).o obj-y += common.o |