diff options
| author | Mark Brown <broonie@sirena.org.uk> | 2013-06-13 16:36:54 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@sirena.org.uk> | 2013-06-13 16:36:54 +0100 |
| commit | 7e1a54fe7dd79d8ccc86397c19e8bfdab21f0ca6 (patch) | |
| tree | 27229267b3816cb00660fa5a7c57604de8c2a3e5 /arch/arm/kernel/setup.c | |
| parent | 44665078f9e4261a98e0d37303d8a0d4aaebaf3d (diff) | |
| parent | 2be12549c900303c418fcbb7044979e190fd4e7e (diff) | |
Automatically merging tracking-iks into merge-manifest
Conflicting files:
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 3f0d5e969ef..7c9fd36be1d 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -303,10 +303,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; |