diff options
| author | Will Deacon <will@kernel.org> | 2024-01-04 12:27:55 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2024-01-04 12:27:55 +0000 |
| commit | 3b47bd8fed0446f4cc89e66d7a532b5f8b6633f3 (patch) | |
| tree | 9741400cebddc121f003ac7452d7285d914e06fa /include | |
| parent | 65180649fa25695e2b156b30965cefde7a033575 (diff) | |
| parent | 7b1a09e44dc64f4f5930659b6d14a27183c00705 (diff) | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/numa.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-generic/numa.h b/include/asm-generic/numa.h index 1a3ad6d29833..c32e0cf23c90 100644 --- a/include/asm-generic/numa.h +++ b/include/asm-generic/numa.h @@ -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 */ |