Commit 3b47bd8f authored by Will Deacon's avatar Will Deacon
Browse files

Merge branch 'for-next/mm' into for-next/core 

* for-next/mm:
  arm64: irq: set the correct node for shadow call stack
  arm64: irq: set the correct node for VMAP stack
parents 65180649 7b1a09e4

arch/arm64/kernel/irq.c

+4 −3
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/vmalloc.h>

#include <asm/daifflags.h>

#include <asm/exception.h>

#include <asm/numa.h>

#include <asm/softirq_stack.h>

#include <asm/stacktrace.h>

#include <asm/vmap_stack.h>
@@ -47,17 +48,17 @@ static void init_irq_scs(void) 


	for_each_possible_cpu(cpu)

		per_cpu(irq_shadow_call_stack_ptr, cpu) =

			scs_alloc(cpu_to_node(cpu));

			scs_alloc(early_cpu_to_node(cpu));

}



#ifdef CONFIG_VMAP_STACK

static void init_irq_stacks(void)

static void __init init_irq_stacks(void)

{

	int cpu;

	unsigned long *p;



	for_each_possible_cpu(cpu) {

		p = arch_alloc_vmap_stack(IRQ_STACK_SIZE, cpu_to_node(cpu));

		p = arch_alloc_vmap_stack(IRQ_STACK_SIZE, early_cpu_to_node(cpu));

		per_cpu(irq_stack_ptr, cpu) = p;

	}

}

drivers/base/arch_numa.c

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ void __init early_map_cpu_to_node(unsigned int cpu, int nid) 
unsigned long __per_cpu_offset[NR_CPUS] __read_mostly;

EXPORT_SYMBOL(__per_cpu_offset);



static int __init early_cpu_to_node(int cpu)

int __init early_cpu_to_node(int cpu)

{

	return cpu_to_node_map[cpu];

}

include/asm-generic/numa.h

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ int __init numa_add_memblk(int nodeid, u64 start, u64 end); 
void __init numa_set_distance(int from, int to, int distance);

void __init numa_free_distance(void);

void __init early_map_cpu_to_node(unsigned int cpu, int nid);

int __init early_cpu_to_node(int cpu);

void numa_store_cpu_info(unsigned int cpu);

void numa_add_cpu(unsigned int cpu);

void numa_remove_cpu(unsigned int cpu);
@@ -46,6 +47,7 @@ static inline void numa_add_cpu(unsigned int cpu) { } 
static inline void numa_remove_cpu(unsigned int cpu) { }

static inline void arch_numa_init(void) { }

static inline void early_map_cpu_to_node(unsigned int cpu, int nid) { }

static inline int early_cpu_to_node(int cpu) { return 0; }



#endif	/* CONFIG_NUMA */