diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-05 08:57:44 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-05 08:57:44 +0200 |
| commit | e5c7bccc3775b49cd7006331826aa90cb76c1992 (patch) | |
| tree | 4d50d9afdb83ebd9ca37a24042ca6dda45d281db /arch/x86/Makefile | |
| parent | 507614ba25ffedcc53f24ca6686c877ff1e2e694 (diff) | |
| parent | e49d033bddf5b565044e2abe4241353959bc9120 (diff) | |
| download | linux-stable-e5c7bccc3775b49cd7006331826aa90cb76c1992.tar.gz linux-stable-e5c7bccc3775b49cd7006331826aa90cb76c1992.tar.bz2 linux-stable-e5c7bccc3775b49cd7006331826aa90cb76c1992.zip | |
Merge 5.12-rc6 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.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 2d6d5a28c3bf..9a85eae37b17 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 |