diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-03-09 15:49:32 (GMT) |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-03-09 15:49:32 (GMT) |
commit | 73a09d212ec65b7068a283e6034fa05649d3d075 (patch) | |
tree | 07e08fb552afd3e0a239e103b9f9cf571593316b /arch/arm/kernel/setup.c | |
parent | 6dbe51c251a327e012439c4772097a13df43c5b8 (diff) | |
parent | 6ebd4d038dbb626a43d87db3007e71f92f49d7b3 (diff) | |
download | linux-fsl-qoriq-73a09d212ec65b7068a283e6034fa05649d3d075.tar.xz |
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/kernel/setup.c')
-rw-r--r-- | arch/arm/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 3f6cbb2..1cc9e17 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -291,10 +291,10 @@ static int cpu_has_aliasing_icache(unsigned int arch) static void __init cacheid_init(void) { - unsigned int cachetype = read_cpuid_cachetype(); unsigned int arch = cpu_architecture(); if (arch >= CPU_ARCH_ARMv6) { + unsigned int cachetype = read_cpuid_cachetype(); if ((cachetype & (7 << 29)) == 4 << 29) { /* ARMv7 register format */ arch = CPU_ARCH_ARMv7; |