diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-06-07 14:36:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-06-07 14:36:57 -0700 |
| commit | 8d437867bafd8b5cfd209bdedddf1ca065f04a96 (patch) | |
| tree | acc0c36949097dbc022a2fdf9de27153f9cdb8bb /arch/arm64/kernel/armv8_deprecated.c | |
| parent | 96e09b8f81668278e2bb70db4cbf80d7549bf7a1 (diff) | |
| parent | 5c40e428aea644c9d924e491b1bc22fa9f272bcc (diff) | |
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fixes from Will Deacon:
- Fix spurious CPU hotplug warning message from SETEND emulation code
- Fix the build when GCC wasn't inlining our I/O accessor internals
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64/io: add constant-argument check
arm64: armv8_deprecated: Fix warning in isndep cpuhp starting process
Diffstat (limited to 'arch/arm64/kernel/armv8_deprecated.c')
| -rw-r--r-- | arch/arm64/kernel/armv8_deprecated.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/kernel/armv8_deprecated.c b/arch/arm64/kernel/armv8_deprecated.c index dd6ce86d4332..b776e7424fe9 100644 --- a/arch/arm64/kernel/armv8_deprecated.c +++ b/arch/arm64/kernel/armv8_deprecated.c @@ -462,6 +462,9 @@ static int run_all_insn_set_hw_mode(unsigned int cpu) for (int i = 0; i < ARRAY_SIZE(insn_emulations); i++) { struct insn_emulation *insn = insn_emulations[i]; bool enable = READ_ONCE(insn->current_mode) == INSN_HW; + if (insn->status == INSN_UNAVAILABLE) + continue; + if (insn->set_hw_mode && insn->set_hw_mode(enable)) { pr_warn("CPU[%u] cannot support the emulation of %s", cpu, insn->name); |