Commit 056612fd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86-cleanups-2023-02-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull miscellaneous x86 cleanups from Thomas Gleixner:

 - Correct the common copy and pasted mishandling of kstrtobool() in the
   strict_sas_size() setup function

 - Make recalibrate_cpu_khz() an GPL only export

 - Check TSC feature before doing anything else which avoids pointless
   code execution if TSC is not available

 - Remove or fixup stale and misleading comments

 - Remove unused or pointelessly duplicated variables

 - Spelling and typo fixes

* tag 'x86-cleanups-2023-02-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/hotplug: Remove incorrect comment about mwait_play_dead()
  x86/tsc: Do feature check as the very first thing
  x86/tsc: Make recalibrate_cpu_khz() export GPL only
  x86/cacheinfo: Remove unused trace variable
  x86/Kconfig: Fix spellos & punctuation
  x86/signal: Fix the value returned by strict_sas_size()
  x86/cpu: Remove misleading comment
  x86/setup: Move duplicate boot_cpu_data definition out of the ifdeffery
  x86/boot/e820: Fix typo in e820.c comment
parents 3f0b0903 fcb3a81d

arch/x86/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -2609,8 +2609,8 @@ config CALL_THUNKS_DEBUG 
	  a noisy dmesg about callthunks generation and call patching for

	  trouble shooting. The debug prints need to be enabled on the

	  kernel command line with 'debug-callthunks'.

	  Only enable this, when you are debugging call thunks as this

	  creates a noticable runtime overhead. If unsure say N.

	  Only enable this when you are debugging call thunks as this

	  creates a noticeable runtime overhead. If unsure say N.



config CPU_IBPB_ENTRY

	bool "Enable IBPB on kernel entry"

arch/x86/kernel/cpu/cacheinfo.c

+1 −4
Original line number Diff line number Diff line
@@ -734,7 +734,7 @@ void init_hygon_cacheinfo(struct cpuinfo_x86 *c) 
void init_intel_cacheinfo(struct cpuinfo_x86 *c)

{

	/* Cache sizes */

	unsigned int trace = 0, l1i = 0, l1d = 0, l2 = 0, l3 = 0;

	unsigned int l1i = 0, l1d = 0, l2 = 0, l3 = 0;

	unsigned int new_l1d = 0, new_l1i = 0; /* Cache sizes from cpuid(4) */

	unsigned int new_l2 = 0, new_l3 = 0, i; /* Cache sizes from cpuid(4) */

	unsigned int l2_id = 0, l3_id = 0, num_threads_sharing, index_msb;
@@ -835,9 +835,6 @@ void init_intel_cacheinfo(struct cpuinfo_x86 *c) 
						case LVL_3:

							l3 += cache_table[k].size;

							break;

						case LVL_TRACE:

							trace += cache_table[k].size;

							break;

						}



						break;

arch/x86/kernel/cpu/common.c

+1 −1
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ static __init int setup_disable_pku(char *arg) 
	return 1;

}

__setup("nopku", setup_disable_pku);

#endif /* CONFIG_X86_64 */

#endif



#ifdef CONFIG_X86_KERNEL_IBT

arch/x86/kernel/e820.c

+3 −3
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ int __init e820__update_table(struct e820_table *table) 


		/* Continue building up new map based on this information: */

		if (current_type != last_type || e820_nomerge(current_type)) {

			if (last_type != 0)	 {

			if (last_type) {

				new_entries[new_nr_entries].size = change_point[chg_idx]->addr - last_addr;

				/* Move forward only if the new size was non-zero: */

				if (new_entries[new_nr_entries].size != 0)
@@ -403,7 +403,7 @@ int __init e820__update_table(struct e820_table *table) 
					if (++new_nr_entries >= max_nr_entries)

						break;

			}

			if (current_type != 0)	{

			if (current_type) {

				new_entries[new_nr_entries].addr = change_point[chg_idx]->addr;

				new_entries[new_nr_entries].type = current_type;

				last_addr = change_point[chg_idx]->addr;

arch/x86/kernel/setup.c

+2 −8
Original line number Diff line number Diff line
@@ -114,11 +114,6 @@ static struct resource bss_resource = { 
#ifdef CONFIG_X86_32

/* CPU data as detected by the assembly code in head_32.S */

struct cpuinfo_x86 new_cpu_data;



/* Common CPU data for all CPUs */

struct cpuinfo_x86 boot_cpu_data __read_mostly;

EXPORT_SYMBOL(boot_cpu_data);



unsigned int def_to_bigsmp;



struct apm_info apm_info;
@@ -132,11 +127,10 @@ EXPORT_SYMBOL(ist_info); 
struct ist_info ist_info;

#endif



#else

struct cpuinfo_x86 boot_cpu_data __read_mostly;

EXPORT_SYMBOL(boot_cpu_data);

#endif



struct cpuinfo_x86 boot_cpu_data __read_mostly;

EXPORT_SYMBOL(boot_cpu_data);



#if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)

__visible unsigned long mmu_cr4_features __ro_after_init;