diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-18 21:11:32 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-18 21:11:32 +0200 |
| commit | 3fbd55ec21e698221ffb43526090137b07c32586 (patch) | |
| tree | 421349dff22226b6b85188a5bf8b0bc6e167dfeb /arch/arm/kernel/setup.c | |
| parent | Merge branch 'for-rmk/hugepages' of git://git.linaro.org/people/stevecapper/l... (diff) | |
| parent | ARM: elf: add new hwcap for identifying atomic ldrd/strd instructions (diff) | |
| download | linux-3fbd55ec21e698221ffb43526090137b07c32586.tar.xz linux-3fbd55ec21e698221ffb43526090137b07c32586.zip | |
Merge branch 'for-rmk/lpae' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable
Conflicts:
arch/arm/kernel/smp.c
Please pull these miscellaneous LPAE fixes I've been collecting for a while
now for 3.11. They've been tested and reviewed by quite a few people, and most
of the patches are pretty trivial. -- Will Deacon.
Diffstat (limited to 'arch/arm/kernel/setup.c')
| -rw-r--r-- | arch/arm/kernel/setup.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index a1a2fbaaa31c..ca34224f891f 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -367,7 +367,7 @@ void __init early_print(const char *str, ...) static void __init cpuid_init_hwcaps(void) { - unsigned int divide_instrs; + unsigned int divide_instrs, vmsa; if (cpu_architecture() < CPU_ARCH_ARMv7) return; @@ -380,6 +380,11 @@ static void __init cpuid_init_hwcaps(void) case 1: elf_hwcap |= HWCAP_IDIVT; } + + /* LPAE implies atomic ldrd/strd instructions */ + vmsa = (read_cpuid_ext(CPUID_EXT_MMFR0) & 0xf) >> 0; + if (vmsa >= 5) + elf_hwcap |= HWCAP_LPAE; } static void __init feat_v6_fixup(void) @@ -892,6 +897,7 @@ static const char *hwcap_str[] = { "vfpv4", "idiva", "idivt", + "lpae", NULL }; |