diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-20 08:18:51 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-20 08:18:51 -0500 |
| commit | dcb30e659287a6b40dafed1362532da42ec27229 (patch) | |
| tree | b5f74a4b605c59bcef144cbe248879b00e99690c /arch/arm64/include/asm/hwcap.h | |
| parent | Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (diff) | |
| parent | arm64: Widen hwcap to be 64 bit (diff) | |
| download | linux-dev-dcb30e659287a6b40dafed1362532da42ec27229.tar.xz linux-dev-dcb30e659287a6b40dafed1362532da42ec27229.zip | |
Merge tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64
Pull ARM64 fixes from Catalin Marinas:
- Compat register fault reporting fix
- Documentation clarification on tagged pointers
- hwcap widened to 64-bit (user space already reading it as 64-bit)
* tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
arm64: Widen hwcap to be 64 bit
arm64: Correctly report LR and SP for compat tasks
arm64: documentation: tighten up tagged pointer documentation
arm64: Make do_bad_area() function static
Diffstat (limited to 'arch/arm64/include/asm/hwcap.h')
| -rw-r--r-- | arch/arm64/include/asm/hwcap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/hwcap.h b/arch/arm64/include/asm/hwcap.h index 6d4482fa35bc..e2950b098e76 100644 --- a/arch/arm64/include/asm/hwcap.h +++ b/arch/arm64/include/asm/hwcap.h @@ -43,6 +43,6 @@ COMPAT_HWCAP_VFPv3|COMPAT_HWCAP_VFPv4|\ COMPAT_HWCAP_NEON|COMPAT_HWCAP_IDIV) -extern unsigned int elf_hwcap; +extern unsigned long elf_hwcap; #endif #endif |