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/kernel/cpuinfo.c | |
| parent | ab3906c53144837f1a192b5c3ba71ec2f938c187 (diff) | |
| parent | 2e8e1ea88cbcb19a77b7acb67f6ffe39cc15740c (diff) | |
| download | linux-bc206065944e2d6bd917e719dc897ffff8dbbca8.tar.bz2 | |
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/kernel/cpuinfo.c')
| -rw-r--r-- | arch/arm64/kernel/cpuinfo.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c index 9013b224591a..86136075ae41 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c @@ -91,6 +91,7 @@ static const char *const hwcap_str[] = { "i8mm", "bf16", "dgh", + "rng", NULL }; |