From 7bcecb3b1cccf8389daf219fffed5a3b8e7e652e Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Wed, 13 Feb 2013 00:45:16 +0900 Subject: [PATCH] --- yaml --- r: 370519 b: refs/heads/master c: f313ae4e98f2c0825a5a808e4b822214836b5085 h: refs/heads/master i: 370517: f559c2b22178b05a605b1396de81117a9b02000c 370515: 0e0a014d57413b8dc56a9b757b22511f6cc9e5fb 370511: ff464ae34235c8d7b943a03ac07ba4cf0897bbaf v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-shmobile/smp-sh73a0.c | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index cb46bc2ae059..f05e77610e6c 100644 --- 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 index acb46a94ccdf..81c0f4ba1846 100644 --- 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); }