diff options
| author | Mark Brown <broonie@kernel.org> | 2021-06-01 18:33:33 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-06-01 18:33:33 +0100 |
| commit | 1a435466b0d470eb9095da0efefea5f7f69acf9c (patch) | |
| tree | a661a705f8236cf7bd86ff250de2f627c9f0a333 /arch/x86/kernel/Makefile | |
| parent | 5cb4e1f33e5eeadbce3814282e010d4dd31816af (diff) | |
| parent | 2ec6f20b33eb4f62ab90bdcd620436c883ec3af6 (diff) | |
| download | lwn-1a435466b0d470eb9095da0efefea5f7f69acf9c.tar.gz lwn-1a435466b0d470eb9095da0efefea5f7f69acf9c.zip | |
Merge branch 'for-5.13' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-5.14
Diffstat (limited to 'arch/x86/kernel/Makefile')
| -rw-r--r-- | arch/x86/kernel/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 0704c2a94272..0f66682ac02a 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -20,7 +20,7 @@ CFLAGS_REMOVE_kvmclock.o = -pg CFLAGS_REMOVE_ftrace.o = -pg CFLAGS_REMOVE_early_printk.o = -pg CFLAGS_REMOVE_head64.o = -pg -CFLAGS_REMOVE_sev-es.o = -pg +CFLAGS_REMOVE_sev.o = -pg endif KASAN_SANITIZE_head$(BITS).o := n @@ -28,7 +28,7 @@ KASAN_SANITIZE_dumpstack.o := n KASAN_SANITIZE_dumpstack_$(BITS).o := n KASAN_SANITIZE_stacktrace.o := n KASAN_SANITIZE_paravirt.o := n -KASAN_SANITIZE_sev-es.o := n +KASAN_SANITIZE_sev.o := n # With some compiler versions the generated code results in boot hangs, caused # by several compilation units. To be safe, disable all instrumentation. @@ -148,7 +148,7 @@ obj-$(CONFIG_UNWINDER_ORC) += unwind_orc.o obj-$(CONFIG_UNWINDER_FRAME_POINTER) += unwind_frame.o obj-$(CONFIG_UNWINDER_GUESS) += unwind_guess.o -obj-$(CONFIG_AMD_MEM_ENCRYPT) += sev-es.o +obj-$(CONFIG_AMD_MEM_ENCRYPT) += sev.o ### # 64 bit specific files ifeq ($(CONFIG_X86_64),y) |