diff options
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r-- | arch/powerpc/kernel/paca.c | 3 | ||||
-rw-r--r-- | arch/powerpc/kernel/pci-common.c | 3 | ||||
-rw-r--r-- | arch/powerpc/kernel/vdso.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/paca.c b/arch/powerpc/kernel/paca.c index 913bfca09c4f..b8480127793d 100644 --- a/arch/powerpc/kernel/paca.c +++ b/arch/powerpc/kernel/paca.c | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <linux/export.h> | 11 | #include <linux/export.h> |
12 | #include <linux/memblock.h> | 12 | #include <linux/memblock.h> |
13 | #include <linux/sched/task.h> | 13 | #include <linux/sched/task.h> |
14 | #include <linux/numa.h> | ||
14 | 15 | ||
15 | #include <asm/lppaca.h> | 16 | #include <asm/lppaca.h> |
16 | #include <asm/paca.h> | 17 | #include <asm/paca.h> |
@@ -36,7 +37,7 @@ static void *__init alloc_paca_data(unsigned long size, unsigned long align, | |||
36 | * which will put its paca in the right place. | 37 | * which will put its paca in the right place. |
37 | */ | 38 | */ |
38 | if (cpu == boot_cpuid) { | 39 | if (cpu == boot_cpuid) { |
39 | nid = -1; | 40 | nid = NUMA_NO_NODE; |
40 | memblock_set_bottom_up(true); | 41 | memblock_set_bottom_up(true); |
41 | } else { | 42 | } else { |
42 | nid = early_cpu_to_node(cpu); | 43 | nid = early_cpu_to_node(cpu); |
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index 88e4f69a09e5..4538e8ddde80 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include <linux/vmalloc.h> | 32 | #include <linux/vmalloc.h> |
33 | #include <linux/slab.h> | 33 | #include <linux/slab.h> |
34 | #include <linux/vgaarb.h> | 34 | #include <linux/vgaarb.h> |
35 | #include <linux/numa.h> | ||
35 | 36 | ||
36 | #include <asm/processor.h> | 37 | #include <asm/processor.h> |
37 | #include <asm/io.h> | 38 | #include <asm/io.h> |
@@ -132,7 +133,7 @@ struct pci_controller *pcibios_alloc_controller(struct device_node *dev) | |||
132 | int nid = of_node_to_nid(dev); | 133 | int nid = of_node_to_nid(dev); |
133 | 134 | ||
134 | if (nid < 0 || !node_online(nid)) | 135 | if (nid < 0 || !node_online(nid)) |
135 | nid = -1; | 136 | nid = NUMA_NO_NODE; |
136 | 137 | ||
137 | PHB_SET_NODE(phb, nid); | 138 | PHB_SET_NODE(phb, nid); |
138 | } | 139 | } |
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c index 7725a9714736..a31b6234fcd7 100644 --- a/arch/powerpc/kernel/vdso.c +++ b/arch/powerpc/kernel/vdso.c | |||
@@ -798,7 +798,6 @@ static int __init vdso_init(void) | |||
798 | BUG_ON(vdso32_pagelist == NULL); | 798 | BUG_ON(vdso32_pagelist == NULL); |
799 | for (i = 0; i < vdso32_pages; i++) { | 799 | for (i = 0; i < vdso32_pages; i++) { |
800 | struct page *pg = virt_to_page(vdso32_kbase + i*PAGE_SIZE); | 800 | struct page *pg = virt_to_page(vdso32_kbase + i*PAGE_SIZE); |
801 | ClearPageReserved(pg); | ||
802 | get_page(pg); | 801 | get_page(pg); |
803 | vdso32_pagelist[i] = pg; | 802 | vdso32_pagelist[i] = pg; |
804 | } | 803 | } |
@@ -812,7 +811,6 @@ static int __init vdso_init(void) | |||
812 | BUG_ON(vdso64_pagelist == NULL); | 811 | BUG_ON(vdso64_pagelist == NULL); |
813 | for (i = 0; i < vdso64_pages; i++) { | 812 | for (i = 0; i < vdso64_pages; i++) { |
814 | struct page *pg = virt_to_page(vdso64_kbase + i*PAGE_SIZE); | 813 | struct page *pg = virt_to_page(vdso64_kbase + i*PAGE_SIZE); |
815 | ClearPageReserved(pg); | ||
816 | get_page(pg); | 814 | get_page(pg); |
817 | vdso64_pagelist[i] = pg; | 815 | vdso64_pagelist[i] = pg; |
818 | } | 816 | } |