diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-03-09 15:49:32 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-03-09 15:49:32 +0000 |
| commit | 73a09d212ec65b7068a283e6034fa05649d3d075 (patch) | |
| tree | 07e08fb552afd3e0a239e103b9f9cf571593316b /arch/arm/mach-omap2/omap-smp.c | |
| parent | 6dbe51c251a327e012439c4772097a13df43c5b8 (diff) | |
| parent | 6ebd4d038dbb626a43d87db3007e71f92f49d7b3 (diff) | |
| download | linux-73a09d212ec65b7068a283e6034fa05649d3d075.tar.gz linux-73a09d212ec65b7068a283e6034fa05649d3d075.tar.bz2 linux-73a09d212ec65b7068a283e6034fa05649d3d075.zip | |
Merge branch 'for-next' of git://git.pengutronix.de/git/ukl/linux into devel-stable
Conflicts:
arch/arm/include/asm/cputype.h
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
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 d9727218dd0a..7f5626d8fd3e 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 |