Commit 1bbb05f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 fixes and cleanups from Thomas Gleixner:
 "This set of updates contains:

   - Robustification for the logical package managment. Cures the AMD
     and virtualization issues.

   - Put the correct start_cpu() return address on the stack of the idle
     task.

   - Fixups for the fallout of the nodeid <-> cpuid persistent mapping
     modifciations

   - Move the x86/MPX specific mm_struct member to the arch specific
     mm_context where it belongs

   - Cleanups for C89 struct initializers and useless function
     arguments"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/floppy: Use designated initializers
  x86/mpx: Move bd_addr to mm_context_t
  x86/mm: Drop unused argument 'removed' from sync_global_pgds()
  ACPI/NUMA: Do not map pxm to node when NUMA is turned off
  x86/acpi: Use proper macro for invalid node
  x86/smpboot: Prevent false positive out of bounds cpumask access warning
  x86/boot/64: Push correct start_cpu() return address
  x86/boot/64: Use 'push' instead of 'call' in start_cpu()
  x86/smpboot: Make logical package management more robust
parents 451bb1a6 ffc7dc8d

arch/arm64/include/asm/numa.h

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ int __node_distance(int from, int to); 


extern nodemask_t numa_nodes_parsed __initdata;



extern bool numa_off;



/* Mappings between node number and cpus on that node. */

extern cpumask_var_t node_to_cpumask_map[MAX_NUMNODES];

void numa_clear_node(unsigned int cpu);

arch/arm64/mm/numa.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static int cpu_to_node_map[NR_CPUS] = { [0 ... NR_CPUS-1] = NUMA_NO_NODE }; 


static int numa_distance_cnt;

static u8 *numa_distance;

static bool numa_off;

bool numa_off;



static __init int numa_parse_early_param(char *opt)

{

arch/ia64/include/asm/numa.h

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ extern int paddr_to_nid(unsigned long paddr); 


#define local_nodeid (cpu_to_node_map[smp_processor_id()])



#define numa_off     0



extern void map_cpu_to_node(int cpu, int nid);

extern void unmap_cpu_from_node(int cpu, int nid);

extern void numa_clear_node(int cpu);

arch/x86/include/asm/floppy.h

+10 −10
Original line number Diff line number Diff line
@@ -229,18 +229,18 @@ static struct fd_routine_l { 
	int (*_dma_setup)(char *addr, unsigned long size, int mode, int io);

} fd_routine[] = {

	{

		request_dma,

		free_dma,

		get_dma_residue,

		dma_mem_alloc,

		hard_dma_setup

		._request_dma		= request_dma,

		._free_dma		= free_dma,

		._get_dma_residue	= get_dma_residue,

		._dma_mem_alloc		= dma_mem_alloc,

		._dma_setup		= hard_dma_setup

	},

	{

		vdma_request_dma,

		vdma_nop,

		vdma_get_dma_residue,

		vdma_mem_alloc,

		vdma_dma_setup

		._request_dma		= vdma_request_dma,

		._free_dma		= vdma_nop,

		._get_dma_residue	= vdma_get_dma_residue,

		._dma_mem_alloc		= vdma_mem_alloc,

		._dma_setup		= vdma_dma_setup

	}

};

arch/x86/include/asm/mmu.h

+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,10 @@ typedef struct { 
	u16 pkey_allocation_map;

	s16 execute_only_pkey;

#endif

#ifdef CONFIG_X86_INTEL_MPX

	/* address of the bounds directory */

	void __user *bd_addr;

#endif

} mm_context_t;



#ifdef CONFIG_SMP

CRA Git | Maintained and supported by SUSTech CRA and CCSE