Commit 6da49d1a 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 cleanups all around the map"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/CPU/AMD: Remove amd_get_topology_early()
  x86/tsc: Remove redundant assignment
  x86/crash: Use resource_size()
  x86/cpu: Add a missing prototype for arch_smt_update()
  x86/nospec: Remove unused RSB_FILL_LOOPS
  x86/vdso: Provide missing include file
  x86/Kconfig: Correct spelling and punctuation
  Documentation/x86/boot: Fix typo
  x86/boot: Fix a comment's incorrect file reference
  x86/process: Remove set but not used variables prev and next
  x86/Kconfig: Fix Kconfig indentation
parents 4244057c 3c749b81

Documentation/x86/boot.rst

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ setting fields in the header, you must make sure only to set fields 
supported by the protocol version in use.





Details of Harder Fileds

Details of Header Fields

========================



For each field, some are information from the kernel to the bootloader

arch/x86/Kconfig

+32 −32
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ config X86_BIGSMP 
	bool "Support for big SMP systems with more than 8 CPUs"

	depends on SMP

	---help---

	  This option is needed for the systems that have more than 8 CPUs

	  This option is needed for the systems that have more than 8 CPUs.



config X86_EXTENDED_PLATFORM

	bool "Support for extended (non-PC) x86 platforms"
@@ -1545,12 +1545,12 @@ config AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT 


# Common NUMA Features

config NUMA

	bool "Numa Memory Allocation and Scheduler Support"

	bool "NUMA Memory Allocation and Scheduler Support"

	depends on SMP

	depends on X86_64 || (X86_32 && HIGHMEM64G && X86_BIGSMP)

	default y if X86_BIGSMP

	---help---

	  Enable NUMA (Non Uniform Memory Access) support.

	  Enable NUMA (Non-Uniform Memory Access) support.



	  The kernel will try to allocate memory used by a CPU on the

	  local memory controller of the CPU and add some more

arch/x86/entry/vdso/vdso32-setup.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/smp.h>

#include <linux/kernel.h>

#include <linux/mm_types.h>

#include <linux/elf.h>



#include <asm/processor.h>

#include <asm/vdso.h>

arch/x86/include/asm/nospec-branch.h

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
 */



#define RSB_CLEAR_LOOPS		32	/* To forcibly overwrite all entries */

#define RSB_FILL_LOOPS		16	/* To avoid underflow */



/*

 * Google experimented with loop-unrolling and this turned out to be

arch/x86/include/asm/realmode.h

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <linux/types.h>

#include <asm/io.h>



/* This must match data at realmode.S */

/* This must match data at realmode/rm/header.S */

struct real_mode_header {

	u32	text_start;

	u32	ro_end;
@@ -36,7 +36,7 @@ struct real_mode_header { 
#endif

};



/* This must match data at trampoline_32/64.S */

/* This must match data at realmode/rm/trampoline_{32,64}.S */

struct trampoline_header {

#ifdef CONFIG_X86_32

	u32 start;

CRA Git | Maintained and supported by SUSTech CRA and CCSE