---

yaml --- r: 370519 b: refs/heads/master c: f313ae4 h: refs/heads/master i: 370517: f559c2b 370515: 0e0a014 370511: ff464ae v: v3
git-mirror · Mar 12, 2013 · 7bcecb3 · 7bcecb3
1 parent e2e822e
commit 7bcecb3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da252b8ee542e95d35374b1d31006f8fe5d59f6a
+refs/heads/master: f313ae4e98f2c0825a5a808e4b822214836b5085
diff --git a/trunk/arch/arm/mach-shmobile/smp-sh73a0.c b/trunk/arch/arm/mach-shmobile/smp-sh73a0.c
@@ -52,13 +52,6 @@ void __init sh73a0_register_twd(void)
 }
 #endif
 
-static unsigned int __init sh73a0_get_core_count(void)
-{
-	void __iomem *scu_base = scu_base_addr();
-
-	return scu_get_core_count(scu_base);
-}
-
 static void __cpuinit sh73a0_secondary_init(unsigned int cpu)
 {
 	gic_secondary_init(0);
@@ -90,7 +83,7 @@ static void __init sh73a0_smp_prepare_cpus(unsigned int max_cpus)
 
 static void __init sh73a0_smp_init_cpus(void)
 {
-	unsigned int ncores = sh73a0_get_core_count();
+	unsigned int ncores = scu_get_core_count(scu_base_addr());
 
 	shmobile_smp_init_cpus(ncores);
 }