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 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek...
[pandora-kernel.git]
/
arch
/
arm
/
mach-exynos4
/
platsmp.c
diff --git
a/arch/arm/mach-exynos4/platsmp.c
b/arch/arm/mach-exynos4/platsmp.c
index
6d35878
..
c5e65a0
100644
(file)
--- a/
arch/arm/mach-exynos4/platsmp.c
+++ b/
arch/arm/mach-exynos4/platsmp.c
@@
-22,6
+22,7
@@
#include <linux/io.h>
#include <asm/cacheflush.h>
#include <linux/io.h>
#include <asm/cacheflush.h>
+#include <asm/hardware/gic.h>
#include <asm/smp_scu.h>
#include <asm/unified.h>
#include <asm/smp_scu.h>
#include <asm/unified.h>
@@
-104,7
+105,7
@@
int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
* the boot monitor to read the system wide flags register,
* and branch to the address found there.
*/
* the boot monitor to read the system wide flags register,
* and branch to the address found there.
*/
-
smp_cross_call
(cpumask_of(cpu), 1);
+
gic_raise_softirq
(cpumask_of(cpu), 1);
timeout = jiffies + (1 * HZ);
while (time_before(jiffies, timeout)) {
timeout = jiffies + (1 * HZ);
while (time_before(jiffies, timeout)) {
@@
-147,6
+148,8
@@
void __init smp_init_cpus(void)
for (i = 0; i < ncores; i++)
set_cpu_possible(i, true);
for (i = 0; i < ncores; i++)
set_cpu_possible(i, true);
+
+ set_smp_cross_call(gic_raise_softirq);
}
void __init platform_smp_prepare_cpus(unsigned int max_cpus)
}
void __init platform_smp_prepare_cpus(unsigned int max_cpus)