Commit 5b7a2095 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 cleanups from Ingo Molnar:
 "Misc small cleanups: removal of superfluous code and coding style
  cleanups mostly"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/kexec: Make variable static and config dependent
  x86/defconfigs: Remove useless UEVENT_HELPER_PATH
  x86/amd_nb: Make hygon_nb_misc_ids static
  x86/tsc: Move inline keyword to the beginning of function declarations
  x86/io_delay: Define IO_DELAY macros in C instead of Kconfig
  x86/io_delay: Break instead of fallthrough in switch statement
parents 6cfcdad7 53b76073

arch/x86/Kconfig.debug

+0 −44
Original line number Diff line number Diff line
@@ -179,26 +179,6 @@ config X86_DECODER_SELFTEST 
	 decoder code.

	 If unsure, say "N".



#

# IO delay types:

#



config IO_DELAY_TYPE_0X80

	int

	default "0"



config IO_DELAY_TYPE_0XED

	int

	default "1"



config IO_DELAY_TYPE_UDELAY

	int

	default "2"



config IO_DELAY_TYPE_NONE

	int

	default "3"



choice

	prompt "IO delay type"

	default IO_DELAY_0X80
@@ -229,30 +209,6 @@ config IO_DELAY_NONE 


endchoice



if IO_DELAY_0X80

config DEFAULT_IO_DELAY_TYPE

	int

	default IO_DELAY_TYPE_0X80

endif



if IO_DELAY_0XED

config DEFAULT_IO_DELAY_TYPE

	int

	default IO_DELAY_TYPE_0XED

endif



if IO_DELAY_UDELAY

config DEFAULT_IO_DELAY_TYPE

	int

	default IO_DELAY_TYPE_UDELAY

endif



if IO_DELAY_NONE

config DEFAULT_IO_DELAY_TYPE

	int

	default IO_DELAY_TYPE_NONE

endif



config DEBUG_BOOT_PARAMS

	bool "Debug boot parameters"

	depends on DEBUG_KERNEL

arch/x86/configs/i386_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ CONFIG_CFG80211=y 
CONFIG_MAC80211=y

CONFIG_MAC80211_LEDS=y

CONFIG_RFKILL=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_DEBUG_DEVRES=y

arch/x86/configs/x86_64_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ CONFIG_CFG80211=y 
CONFIG_MAC80211=y

CONFIG_MAC80211_LEDS=y

CONFIG_RFKILL=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_DEBUG_DEVRES=y

arch/x86/kernel/amd_nb.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static const struct pci_device_id hygon_root_ids[] = { 
	{}

};



const struct pci_device_id hygon_nb_misc_ids[] = {

static const struct pci_device_id hygon_nb_misc_ids[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) },

	{}

};

arch/x86/kernel/crash.c

+3 −1
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ struct crash_memmap_data { 
 */

crash_vmclear_fn __rcu *crash_vmclear_loaded_vmcss = NULL;

EXPORT_SYMBOL_GPL(crash_vmclear_loaded_vmcss);

unsigned long crash_zero_bytes;



static inline void cpu_crash_vmclear_loaded_vmcss(void)

{
@@ -173,6 +172,9 @@ void native_machine_crash_shutdown(struct pt_regs *regs) 
}



#ifdef CONFIG_KEXEC_FILE



static unsigned long crash_zero_bytes;



static int get_nr_ram_ranges_callback(struct resource *res, void *arg)

{

	unsigned int *nr_ranges = arg;

CRA Git | Maintained and supported by SUSTech CRA and CCSE