diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-08-07 04:02:34 (GMT) |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-08-07 04:02:34 (GMT) |
| commit | 278539101416d8d469f63fcd718933b4c58f966a (patch) | |
| tree | c6bdd637d38ee40efb8b7e5790f156c37b36b5c6 /arch/powerpc/kernel/setup_64.c | |
| parent | dadf6cd391f4208cfe0fbb01ba5b70c0f1b3b920 (diff) | |
| parent | db397d9c6e66afdd34ae430172db122632b5f8a7 (diff) | |
| download | linux-278539101416d8d469f63fcd718933b4c58f966a.tar.xz | |
Merge tag 'v4.9.41' into linux-linaro-lsk-v4.9
This is the 4.9.41 stable release
Diffstat (limited to 'arch/powerpc/kernel/setup_64.c')
| -rw-r--r-- | arch/powerpc/kernel/setup_64.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index ada71be..a12be60 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c @@ -595,7 +595,7 @@ void __init emergency_stack_init(void) static void * __init pcpu_fc_alloc(unsigned int cpu, size_t size, size_t align) { - return __alloc_bootmem_node(NODE_DATA(early_cpu_to_node(cpu)), size, align, + return __alloc_bootmem_node(NODE_DATA(cpu_to_node(cpu)), size, align, __pa(MAX_DMA_ADDRESS)); } @@ -606,7 +606,7 @@ static void __init pcpu_fc_free(void *ptr, size_t size) static int pcpu_cpu_distance(unsigned int from, unsigned int to) { - if (early_cpu_to_node(from) == early_cpu_to_node(to)) + if (cpu_to_node(from) == cpu_to_node(to)) return LOCAL_DISTANCE; else return REMOTE_DISTANCE; |