diff options
| author | Will Deacon <will@kernel.org> | 2022-07-25 10:58:10 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2022-07-25 10:58:10 +0100 |
| commit | 92867739e3439ecc9bfa0a106be515d93f14c735 (patch) | |
| tree | de0760bee7f4f5f8da5da8d94d995b1d334b7332 /arch/arm64/include/asm/cpufeature.h | |
| parent | e8da08fc3d329d59a9e338ca6b273fd9e14f7d54 (diff) | |
| parent | a6a468f50d6a1fa20bcd023f286713d243f5025d (diff) | |
| download | linux-92867739e3439ecc9bfa0a106be515d93f14c735.tar.bz2 | |
Merge branch 'for-next/cpufeature' into for-next/core
* for-next/cpufeature:
arm64/hwcap: Support FEAT_EBF16
arm64/cpufeature: Store elf_hwcaps as a bitmap rather than unsigned long
arm64/hwcap: Document allocation of upper bits of AT_HWCAP
arm64: trap implementation defined functionality in userspace
Diffstat (limited to 'arch/arm64/include/asm/cpufeature.h')
| -rw-r--r-- | arch/arm64/include/asm/cpufeature.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h index fe59035bdc22..f7f2227db56f 100644 --- a/arch/arm64/include/asm/cpufeature.h +++ b/arch/arm64/include/asm/cpufeature.h @@ -11,7 +11,7 @@ #include <asm/hwcap.h> #include <asm/sysreg.h> -#define MAX_CPU_FEATURES 64 +#define MAX_CPU_FEATURES 128 #define cpu_feature(x) KERNEL_HWCAP_ ## x #ifndef __ASSEMBLY__ |