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 branch 'xen/xenbus' into upstream/xen
[pandora-kernel.git]
/
arch
/
arm
/
kernel
/
smp.c
diff --git
a/arch/arm/kernel/smp.c
b/arch/arm/kernel/smp.c
index
a01194e
..
b8c3d0f
100644
(file)
--- a/
arch/arm/kernel/smp.c
+++ b/
arch/arm/kernel/smp.c
@@
-168,7
+168,7
@@
int __cpu_disable(void)
struct task_struct *p;
int ret;
- ret =
mach
_cpu_disable(cpu);
+ ret =
platform
_cpu_disable(cpu);
if (ret)
return ret;