Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull x86 build updates from Ingo Molnar:
 "A handful of updates: two linker script cleanups and a stock
  defconfig+allmodconfig bootability fix"

* 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/vdso: Discard .note.gnu.property sections in vDSO
  x86, vmlinux.lds: Add RUNTIME_DISCARD_EXIT to generic DISCARDS
  x86/Kconfig: Make CMDLINE_OVERRIDE depend on non-empty CMDLINE

diff --combined arch/x86/Kconfig
index 47107eebc6855372e3bcf78e84b2adb216683666,b41419231b900a6ba19d70eb3a0817bd4ebd2068..ade80caafe6b49349cdd86e0a9c0a92d7e4dd837
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -30,6 -30,7 +30,6 @@@ config X86_6
        select MODULES_USE_ELF_RELA
        select NEED_DMA_MAP_STATE
        select SWIOTLB
 -      select ARCH_HAS_SYSCALL_WRAPPER
  
  config FORCE_DYNAMIC_FTRACE
        def_bool y
@@@ -56,6 -57,7 +56,6 @@@ config X8
        select ACPI_LEGACY_TABLES_LOOKUP        if ACPI
        select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI
        select ARCH_32BIT_OFF_T                 if X86_32
 -      select ARCH_CLOCKSOURCE_DATA
        select ARCH_CLOCKSOURCE_INIT
        select ARCH_HAS_ACPI_TABLE_UPGRADE      if ACPI
        select ARCH_HAS_DEBUG_VIRTUAL
@@@ -78,7 -80,6 +78,7 @@@
        select ARCH_HAS_STRICT_KERNEL_RWX
        select ARCH_HAS_STRICT_MODULE_RWX
        select ARCH_HAS_SYNC_CORE_BEFORE_USERMODE
 +      select ARCH_HAS_SYSCALL_WRAPPER
        select ARCH_HAS_UBSAN_SANITIZE_ALL
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select ARCH_MIGHT_HAVE_ACPI_PDC         if ACPI
@@@ -127,7 -128,6 +127,7 @@@
        select GENERIC_GETTIMEOFDAY
        select GENERIC_VDSO_TIME_NS
        select GUP_GET_PTE_LOW_HIGH             if X86_PAE
 +      select HARDIRQS_SW_RESEND
        select HARDLOCKUP_CHECK_TIMESTAMP       if X86_64
        select HAVE_ACPI_APEI                   if ACPI
        select HAVE_ACPI_APEI_NMI               if ACPI
@@@ -1875,6 -1875,7 +1875,6 @@@ config X86_SMA
  
  config X86_UMIP
        def_bool y
 -      depends on CPU_SUP_INTEL || CPU_SUP_AMD
        prompt "User Mode Instruction Prevention" if EXPERT
        ---help---
          User Mode Instruction Prevention (UMIP) is a security feature in
@@@ -2417,7 -2418,7 +2417,7 @@@ config CMDLIN
  
  config CMDLINE_OVERRIDE
        bool "Built-in command line overrides boot loader arguments"
-       depends on CMDLINE_BOOL
+       depends on CMDLINE_BOOL && CMDLINE != ""
        ---help---
          Set this option to 'Y' to have the kernel ignore the boot loader
          command line, and use ONLY the built-in command line.

diff --combined arch/x86/kernel/vmlinux.lds.S
index 5cab3a29adcbc596cbf940f4127aea481852acce,7206e1ac23ddce7554589af025b7535c52947f51..1bf7e312361f4f90d65f57228e6a7e5c1127ddc1
--- 1/arch/x86/kernel/vmlinux.lds.S
--- 2/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@@ -21,6 -21,7 +21,7 @@@
  #define LOAD_OFFSET __START_KERNEL_map
  #endif
  
+ #define RUNTIME_DISCARD_EXIT
  #define EMITS_PT_NOTE
  #define RO_EXCEPTION_TABLE_ALIGN      16
  
@@@ -313,8 -314,8 +314,8 @@@ SECTION
  
        . = ALIGN(8);
        /*
 -       * .exit.text is discard at runtime, not link time, to deal with
 -       *  references from .altinstructions and .eh_frame
 +       * .exit.text is discarded at runtime, not link time, to deal with
 +       *  references from .altinstructions
         */
        .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
                EXIT_TEXT
@@@ -412,6 -413,9 +413,6 @@@
        DWARF_DEBUG
  
        DISCARDS
 -      /DISCARD/ : {
 -              *(.eh_frame)
 -      }
  }