diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-04-02 12:33:16 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-04-02 12:33:16 +0200 |
| commit | e855e80d001530ec0bbb1ee1ca6a16ac6bdf9acf (patch) | |
| tree | 5f762f2992658891c565af4f923147b384bf0dd4 /arch/x86/Makefile | |
| parent | Merge 'x86/alternatives' (diff) | |
| parent | Linux 5.12-rc5 (diff) | |
| download | linux-e855e80d001530ec0bbb1ee1ca6a16ac6bdf9acf.tar.xz linux-e855e80d001530ec0bbb1ee1ca6a16ac6bdf9acf.zip | |
Merge tag 'v5.12-rc5' into WIP.x86/core, to pick up recent NOP related changes
In particular we want to have this upstream commit:
b90829704780: ("bpf: Use NOP_ATOMIC5 instead of emit_nops(&prog, 5) for BPF_TRAMP_F_CALL_ORIG")
... before merging in x86/cpu changes and the removal of the NOP optimizations, and
applying PeterZ's !retpoline objtool series.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/Makefile')
| -rw-r--r-- | arch/x86/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 952f534ad7b7..c84d0dc492cb 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -27,7 +27,7 @@ endif REALMODE_CFLAGS := -m16 -g -Os -DDISABLE_BRANCH_PROFILING \ -Wall -Wstrict-prototypes -march=i386 -mregparm=3 \ -fno-strict-aliasing -fomit-frame-pointer -fno-pic \ - -mno-mmx -mno-sse + -mno-mmx -mno-sse $(call cc-option,-fcf-protection=none) REALMODE_CFLAGS += -ffreestanding REALMODE_CFLAGS += -fno-stack-protector |