diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2023-06-23 16:58:19 -0700 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2023-06-23 16:58:19 -0700 |
| commit | 63773d2b593d86440c3b96fd300ed80d00cd06ef (patch) | |
| tree | ebc7b1e8f1c0ce535ef9c6120209d0e87d8d4b16 /arch/x86 | |
| parent | cf01724e2d73a90524450e3dd8798cfb9d7aca05 (diff) | |
| parent | 814bc1de03ea4361101408e63a68e4b82aef22cb (diff) | |
| download | linux-63773d2b593d86440c3b96fd300ed80d00cd06ef.tar.gz linux-63773d2b593d86440c3b96fd300ed80d00cd06ef.tar.bz2 linux-63773d2b593d86440c3b96fd300ed80d00cd06ef.zip | |
Merge mm-hotfixes-stable into mm-stable to pick up depended-upon changes.
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/crypto/aria-aesni-avx-asm_64.S | 2 | ||||
| -rw-r--r-- | arch/x86/purgatory/Makefile | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/x86/crypto/aria-aesni-avx-asm_64.S b/arch/x86/crypto/aria-aesni-avx-asm_64.S index 7c1abc513f34..9556dacd9841 100644 --- a/arch/x86/crypto/aria-aesni-avx-asm_64.S +++ b/arch/x86/crypto/aria-aesni-avx-asm_64.S @@ -773,8 +773,6 @@ .octa 0x3F893781E95FE1576CDA64D2BA0CB204 #ifdef CONFIG_AS_GFNI -.section .rodata.cst8, "aM", @progbits, 8 -.align 8 /* AES affine: */ #define tf_aff_const BV8(1, 1, 0, 0, 0, 1, 1, 0) .Ltf_aff_bitmatrix: diff --git a/arch/x86/purgatory/Makefile b/arch/x86/purgatory/Makefile index 82fec66d46d2..42abd6af1198 100644 --- a/arch/x86/purgatory/Makefile +++ b/arch/x86/purgatory/Makefile @@ -14,6 +14,11 @@ $(obj)/sha256.o: $(srctree)/lib/crypto/sha256.c FORCE CFLAGS_sha256.o := -D__DISABLE_EXPORTS +# When profile-guided optimization is enabled, llvm emits two different +# overlapping text sections, which is not supported by kexec. Remove profile +# optimization flags. +KBUILD_CFLAGS := $(filter-out -fprofile-sample-use=% -fprofile-use=%,$(KBUILD_CFLAGS)) + # When linking purgatory.ro with -r unresolved symbols are not checked, # also link a purgatory.chk binary without -r to check for unresolved symbols. PURGATORY_LDFLAGS := -e purgatory_start -z nodefaultlib |