Merge tag 'clang-lto-v5.12-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / arch / x86 / Makefile

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 845baf5..2d6d5a2 100644 (file)
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -50,6 +50,9 @@ export BITS
 KBUILD_CFLAGS += -mno-sse -mno-mmx -mno-sse2 -mno-3dnow
 KBUILD_CFLAGS += $(call cc-option,-mno-avx,)
 
+# Intel CET isn't enabled in the kernel
+KBUILD_CFLAGS += $(call cc-option,-fcf-protection=none)
+
 ifeq ($(CONFIG_X86_32),y)
         BITS := 32
         UTS_MACHINE := i386
@@ -234,9 +237,6 @@ core-y += arch/x86/
 drivers-$(CONFIG_MATH_EMULATION) += arch/x86/math-emu/
 drivers-$(CONFIG_PCI)            += arch/x86/pci/
 
-# must be linked after kernel/
-drivers-$(CONFIG_OPROFILE) += arch/x86/oprofile/
-
 # suspend and hibernation support
 drivers-$(CONFIG_PM) += arch/x86/power/
 
@@ -297,16 +297,20 @@ archclean:
        $(Q)$(MAKE) $(clean)=arch/x86/tools
 
 define archhelp
-  echo  '* bzImage      - Compressed kernel image (arch/x86/boot/bzImage)'
-  echo  '  install      - Install kernel using'
-  echo  '                  (your) ~/bin/$(INSTALLKERNEL) or'
-  echo  '                  (distribution) /sbin/$(INSTALLKERNEL) or'
-  echo  '                  install to $$(INSTALL_PATH) and run lilo'
-  echo  '  fdimage      - Create 1.4MB boot floppy image (arch/x86/boot/fdimage)'
-  echo  '  fdimage144   - Create 1.4MB boot floppy image (arch/x86/boot/fdimage)'
-  echo  '  fdimage288   - Create 2.8MB boot floppy image (arch/x86/boot/fdimage)'
-  echo  '  isoimage     - Create a boot CD-ROM image (arch/x86/boot/image.iso)'
-  echo  '                  bzdisk/fdimage*/isoimage also accept:'
-  echo  '                  FDARGS="..."  arguments for the booted kernel'
-  echo  '                  FDINITRD=file initrd for the booted kernel'
+  echo  '* bzImage             - Compressed kernel image (arch/x86/boot/bzImage)'
+  echo  '  install             - Install kernel using (your) ~/bin/$(INSTALLKERNEL) or'
+  echo  '                        (distribution) /sbin/$(INSTALLKERNEL) or install to '
+  echo  '                        $$(INSTALL_PATH) and run lilo'
+  echo  ''
+  echo  '  fdimage             - Create 1.4MB boot floppy image (arch/x86/boot/fdimage)'
+  echo  '  fdimage144          - Create 1.4MB boot floppy image (arch/x86/boot/fdimage)'
+  echo  '  fdimage288          - Create 2.8MB boot floppy image (arch/x86/boot/fdimage)'
+  echo  '  isoimage            - Create a boot CD-ROM image (arch/x86/boot/image.iso)'
+  echo  '                        bzdisk/fdimage*/isoimage also accept:'
+  echo  '                        FDARGS="..."  arguments for the booted kernel'
+  echo  '                        FDINITRD=file initrd for the booted kernel'
+  echo  ''
+  echo  '  kvm_guest.config    - Enable Kconfig items for running this kernel as a KVM guest'
+  echo  '  xen.config          - Enable Kconfig items for running this kernel as a Xen guest'
+
 endef