Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
x86: setup_per_cpu_areas() cleanup
Impact: cleanup
__alloc_bootmem and __alloc_bootmem_node do panic
for us in case of fail so no need for additional
checks here.
Also lets use pr_*() macros for printing.
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
authored by
Cyrill Gorcunov
and committed by
Ingo Molnar
ab14398a
8fd2d2d5
+8
-17
arch/x86/kernel/setup_percpu.c
+8
-17
arch/x86/kernel/setup_percpu.c
···
153
align = max_t(unsigned long, PAGE_SIZE, align);
154
size = roundup(old_size, align);
155
156
-
printk(KERN_INFO
157
-
"NR_CPUS:%d nr_cpumask_bits:%d nr_cpu_ids:%d nr_node_ids:%d\n",
158
NR_CPUS, nr_cpumask_bits, nr_cpu_ids, nr_node_ids);
159
160
-
printk(KERN_INFO "PERCPU: Allocating %zd bytes of per cpu data\n",
161
-
size);
162
163
for_each_possible_cpu(cpu) {
164
#ifndef CONFIG_NEED_MULTIPLE_NODES
···
167
if (!node_online(node) || !NODE_DATA(node)) {
168
ptr = __alloc_bootmem(size, align,
169
__pa(MAX_DMA_ADDRESS));
170
-
printk(KERN_INFO
171
-
"cpu %d has no node %d or node-local memory\n",
172
cpu, node);
173
-
if (ptr)
174
-
printk(KERN_DEBUG
175
-
"per cpu data for cpu%d at %016lx\n",
176
-
cpu, __pa(ptr));
177
-
}
178
-
else {
179
ptr = __alloc_bootmem_node(NODE_DATA(node), size, align,
180
__pa(MAX_DMA_ADDRESS));
181
-
if (ptr)
182
-
printk(KERN_DEBUG
183
-
"per cpu data for cpu%d on node%d "
184
-
"at %016lx\n",
185
-
cpu, node, __pa(ptr));
186
}
187
#endif
188
per_cpu_offset(cpu) = ptr - __per_cpu_start;
···
153
align = max_t(unsigned long, PAGE_SIZE, align);
154
size = roundup(old_size, align);
155
156
+
pr_info("NR_CPUS:%d nr_cpumask_bits:%d nr_cpu_ids:%d nr_node_ids:%d\n",
157
NR_CPUS, nr_cpumask_bits, nr_cpu_ids, nr_node_ids);
158
159
+
pr_info("PERCPU: Allocating %zd bytes of per cpu data\n", size);
160
161
for_each_possible_cpu(cpu) {
162
#ifndef CONFIG_NEED_MULTIPLE_NODES
···
169
if (!node_online(node) || !NODE_DATA(node)) {
170
ptr = __alloc_bootmem(size, align,
171
__pa(MAX_DMA_ADDRESS));
172
+
pr_info("cpu %d has no node %d or node-local memory\n",
173
cpu, node);
174
+
pr_debug("per cpu data for cpu%d at %016lx\n",
175
+
cpu, __pa(ptr));
176
+
} else {
177
ptr = __alloc_bootmem_node(NODE_DATA(node), size, align,
178
__pa(MAX_DMA_ADDRESS));
179
+
pr_debug("per cpu data for cpu%d on node%d at %016lx\n",
180
+
cpu, node, __pa(ptr));
181
}
182
#endif
183
per_cpu_offset(cpu) = ptr - __per_cpu_start;