diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-18 20:11:32 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-18 20:11:32 +0100 |
| commit | 3fbd55ec21e698221ffb43526090137b07c32586 (patch) | |
| tree | 421349dff22226b6b85188a5bf8b0bc6e167dfeb /arch/arm/include/uapi | |
| parent | b3f288de7c8add67a3364e989b865b6537838662 (diff) | |
| parent | a469abd0f868c902b75532579bf87553dcf1b360 (diff) | |
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/include/uapi')
| -rw-r--r-- | arch/arm/include/uapi/asm/hwcap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/uapi/asm/hwcap.h b/arch/arm/include/uapi/asm/hwcap.h index 3688fd15a32d..6d34d080372a 100644 --- a/arch/arm/include/uapi/asm/hwcap.h +++ b/arch/arm/include/uapi/asm/hwcap.h @@ -25,6 +25,6 @@ #define HWCAP_IDIVT (1 << 18) #define HWCAP_VFPD32 (1 << 19) /* set if VFP has 32 regs (not 16) */ #define HWCAP_IDIV (HWCAP_IDIVA | HWCAP_IDIVT) - +#define HWCAP_LPAE (1 << 20) #endif /* _UAPI__ASMARM_HWCAP_H */ |