diff options
| author | Will Deacon <will@kernel.org> | 2023-04-20 11:22:09 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2023-04-20 11:22:09 +0100 |
| commit | 81444b77a4443e985b567310f19d601368ed4762 (patch) | |
| tree | 2f87700054a6efd809127b53ea782d802e654fbf /arch/arm64/kernel/idreg-override.c | |
| parent | f8863bc8c1f9cf4bc3bdc58a98c5a41d0b4c14c5 (diff) | |
| parent | b7b4ce84c830ae3ce6429fbbd70a62a4ae1ac78d (diff) | |
| download | linux-81444b77a4443e985b567310f19d601368ed4762.tar.gz linux-81444b77a4443e985b567310f19d601368ed4762.tar.bz2 linux-81444b77a4443e985b567310f19d601368ed4762.zip | |
Merge branch 'for-next/misc' into for-next/core
* for-next/misc:
arm64: kexec: include reboot.h
arm64: delete dead code in this_cpu_set_vectors()
arm64: kernel: Fix kernel warning when nokaslr is passed to commandline
arm64: kgdb: Set PSTATE.SS to 1 to re-enable single-step
arm64/sme: Fix some comments of ARM SME
arm64/signal: Alloc tpidr2 sigframe after checking system_supports_tpidr2()
arm64/signal: Use system_supports_tpidr2() to check TPIDR2
arm64: compat: Remove defines now in asm-generic
arm64: kexec: remove unnecessary (void*) conversions
arm64: armv8_deprecated: remove unnecessary (void*) conversions
firmware: arm_sdei: Fix sleep from invalid context BUG
Diffstat (limited to 'arch/arm64/kernel/idreg-override.c')
| -rw-r--r-- | arch/arm64/kernel/idreg-override.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm64/kernel/idreg-override.c b/arch/arm64/kernel/idreg-override.c index d833d78a7f31..964ba6efc7a0 100644 --- a/arch/arm64/kernel/idreg-override.c +++ b/arch/arm64/kernel/idreg-override.c @@ -178,6 +178,13 @@ static const struct { { "nokaslr", "kaslr.disabled=1" }, }; +static int __init parse_nokaslr(char *unused) +{ + /* nokaslr param handling is done by early cpufeature code */ + return 0; +} +early_param("nokaslr", parse_nokaslr); + static int __init find_field(const char *cmdline, const struct ftr_set_desc *reg, int f, u64 *v) { |