diff options
| author |   Will Deacon <will@kernel.org> | 2020-01-22 11:38:53 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2020-01-22 11:38:53 +0000 |
| commit | bc206065944e2d6bd917e719dc897ffff8dbbca8 (patch) | |
| tree | c085dc23f5b52e0621b164f0d5fd205d8bd50b47 /arch/arm64/include/asm/cpucaps.h | |
| parent | Merge branch 'for-next/errata' into for-next/core (diff) | |
| parent | arm64: Use v8.5-RNG entropy for KASLR seed (diff) | |
| download | linux-dev-bc206065944e2d6bd917e719dc897ffff8dbbca8.tar.xz linux-dev-bc206065944e2d6bd917e719dc897ffff8dbbca8.zip | |
Merge branch 'for-next/rng' into for-next/core
* for-next/rng: (2 commits)
arm64: Use v8.5-RNG entropy for KASLR seed
...
Diffstat (limited to 'arch/arm64/include/asm/cpucaps.h')
| -rw-r--r-- | arch/arm64/include/asm/cpucaps.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/cpucaps.h b/arch/arm64/include/asm/cpucaps.h index a61c33611e39..865e0253fc1e 100644 --- a/arch/arm64/include/asm/cpucaps.h +++ b/arch/arm64/include/asm/cpucaps.h @@ -57,7 +57,8 @@ #define ARM64_WORKAROUND_1542419 47 #define ARM64_WORKAROUND_SPECULATIVE_AT_NVHE 48 #define ARM64_HAS_E0PD 49 +#define ARM64_HAS_RNG 50 -#define ARM64_NCAPS 50 +#define ARM64_NCAPS 51 #endif /* __ASM_CPUCAPS_H */ |