diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-06-15 15:03:50 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-06-15 15:03:50 -0400 |
| commit | 22120d2bdfe905fff7e5ad86de4c6d6018e52751 (patch) | |
| tree | cc72c89cb2c24772749f4e98038d4374803ec55e /arch/arm/kernel/setup.c | |
| parent | da9783558c467d9f0688230f5e77d2921cd41007 (diff) | |
| parent | 4c6dfbfe2926eca135851dc5c403bf3ab84c533b (diff) | |
Merge remote branch 'catalin/rebased'linaro_merge_100616
Conflicts:
arch/arm/kernel/entry-armv.S
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 122d999bdc7..4080a8913c7 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -219,7 +219,7 @@ int cpu_architecture(void) * Register 0 and check for VMSAv7 or PMSAv7 */ asm("mrc p15, 0, %0, c0, c1, 4" : "=r" (mmfr0)); - if ((mmfr0 & 0x0000000f) == 0x00000003 || + if ((mmfr0 & 0x0000000f) >= 0x00000003 || (mmfr0 & 0x000000f0) == 0x00000030) cpu_arch = CPU_ARCH_ARMv7; else if ((mmfr0 & 0x0000000f) == 0x00000002 || |