projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
arch
/
sparc
/
kernel
/
prom_64.c
diff --git
a/arch/sparc/kernel/prom_64.c
b/arch/sparc/kernel/prom_64.c
index
6b39125
..
9a690d3
100644
(file)
--- a/
arch/sparc/kernel/prom_64.c
+++ b/
arch/sparc/kernel/prom_64.c
@@
-555,9
+555,6
@@
static void *fill_in_one_cpu(struct device_node *dp, int cpuid, int arg)
cpu_data(cpuid).core_id = portid + 1;
cpu_data(cpuid).proc_id = portid;
-#ifdef CONFIG_SMP
- sparc64_multi_core = 1;
-#endif
} else {
cpu_data(cpuid).dcache_size =
of_getintprop_default(dp, "dcache-size", 16 * 1024);