git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
s390
/
kernel
/
smp.c
diff --git
a/arch/s390/kernel/smp.c
b/arch/s390/kernel/smp.c
index
343120c
..
8e03219
100644
(file)
--- a/
arch/s390/kernel/smp.c
+++ b/
arch/s390/kernel/smp.c
@@
-869,7
+869,7
@@
static int __init topology_init(void)
int ret;
for_each_possible_cpu(cpu) {
- ret = register_cpu(&per_cpu(cpu_devices, cpu), cpu
, NULL
);
+ ret = register_cpu(&per_cpu(cpu_devices, cpu), cpu);
if (ret)
printk(KERN_WARNING "topology_init: register_cpu %d "
"failed (%d)\n", cpu, ret);