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 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[pandora-kernel.git]
/
arch
/
arm
/
mach-shmobile
/
smp-sh73a0.c
diff --git
a/arch/arm/mach-shmobile/smp-sh73a0.c
b/arch/arm/mach-shmobile/smp-sh73a0.c
index
a156d21
..
3ffdbc9
100644
(file)
--- a/
arch/arm/mach-shmobile/smp-sh73a0.c
+++ b/
arch/arm/mach-shmobile/smp-sh73a0.c
@@
-59,6
+59,11
@@
unsigned int __init sh73a0_get_core_count(void)
{
void __iomem *scu_base = scu_base_addr();
{
void __iomem *scu_base = scu_base_addr();
+#ifdef CONFIG_HAVE_ARM_TWD
+ /* twd_base needs to be initialized before percpu_timer_setup() */
+ twd_base = (void __iomem *)0xf0000600;
+#endif
+
return scu_get_core_count(scu_base);
}
return scu_get_core_count(scu_base);
}
@@
-82,10
+87,6
@@
int __cpuinit sh73a0_boot_secondary(unsigned int cpu)
void __init sh73a0_smp_prepare_cpus(void)
{
void __init sh73a0_smp_prepare_cpus(void)
{
-#ifdef CONFIG_HAVE_ARM_TWD
- twd_base = (void __iomem *)0xf0000600;
-#endif
-
scu_enable(scu_base_addr());
/* Map the reset vector (in headsmp.S) */
scu_enable(scu_base_addr());
/* Map the reset vector (in headsmp.S) */