diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2013-01-30 17:38:21 +0100 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2013-01-31 21:44:47 +0100 |
commit | ac52e83f4c76992925e13d0f4e901ffd4c207261 (patch) | |
tree | 46fe1ef82ed53be1c3cb546f0efdef7c0bb52a42 /arch/arm/mach-omap2/omap-smp.c | |
parent | 473296e072ae77e96586dcb39a1dd5d10db22611 (diff) | |
download | linux-ac52e83f4c76992925e13d0f4e901ffd4c207261.tar.gz linux-ac52e83f4c76992925e13d0f4e901ffd4c207261.tar.bz2 linux-ac52e83f4c76992925e13d0f4e901ffd4c207261.zip |
ARM: use read_cpuid_id() instead of read_cpuid(CPUID_ID)
Both calls are identical currently. This patch prepares to deprecate
read_cpuid on machines without cp15.
Also move an unconditional usage of read_cpuid_cachetype to a more local
scope as read_cpuid_cachetype uses read_cpuid, too.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Message-Id: 1359646587-1788-1-git-send-email-u.kleine-koenig@pengutronix.de
Diffstat (limited to 'arch/arm/mach-omap2/omap-smp.c')
-rw-r--r-- | arch/arm/mach-omap2/omap-smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c index cd42d921940d..707098ecf8d3 100644 --- a/arch/arm/mach-omap2/omap-smp.c +++ b/arch/arm/mach-omap2/omap-smp.c @@ -209,7 +209,7 @@ static void __init omap4_smp_init_cpus(void) unsigned int i = 0, ncores = 1, cpu_id; /* Use ARM cpuid check here, as SoC detection will not work so early */ - cpu_id = read_cpuid(CPUID_ID) & CPU_MASK; + cpu_id = read_cpuid_id() & CPU_MASK; if (cpu_id == CPU_CORTEX_A9) { /* * Currently we can't call ioremap here because |