diff options
author | Paul Burton <paulburton@kernel.org> | 2019-11-01 14:35:49 -0700 |
---|---|---|
committer | Paul Burton <paulburton@kernel.org> | 2019-11-01 14:36:44 -0700 |
commit | 02fce139fd14d3b0126f0a72e8c0a83b5b01f9f5 (patch) | |
tree | 20e69aae8d0acfcd7edc954e70a9d751e0b54a7e /arch/arm64/kernel/armv8_deprecated.c | |
parent | 8a5a499871308c093ced3c5a383b72502b96e0d2 (diff) | |
parent | b42aa3fd5957e4daf4b69129e5ce752a2a53e7d6 (diff) | |
download | linux-stable-02fce139fd14d3b0126f0a72e8c0a83b5b01f9f5.tar.gz linux-stable-02fce139fd14d3b0126f0a72e8c0a83b5b01f9f5.tar.bz2 linux-stable-02fce139fd14d3b0126f0a72e8c0a83b5b01f9f5.zip |
Merge tag 'mips_fixes_5.4_3' into mips-next
Pull in mips-fixes primarily to gain build fixes in order to allow
better testing of mips-next.
A few MIPS fixes:
- Fix VDSO time-related function behavior for systems where we need to
fall back to syscalls, but were instead returning bogus results.
- A fix to TLB exception handlers for Cavium Octeon systems where they
would inadvertently clobber the $1/$at register.
- A build fix for bcm63xx configurations.
- Switch to using my @kernel.org email address.
Signed-off-by: Paul Burton <paulburton@kernel.org>
Diffstat (limited to 'arch/arm64/kernel/armv8_deprecated.c')
-rw-r--r-- | arch/arm64/kernel/armv8_deprecated.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm64/kernel/armv8_deprecated.c b/arch/arm64/kernel/armv8_deprecated.c index 2ec09debc2bb..ca158be21f83 100644 --- a/arch/arm64/kernel/armv8_deprecated.c +++ b/arch/arm64/kernel/armv8_deprecated.c @@ -174,6 +174,9 @@ static void __init register_insn_emulation(struct insn_emulation_ops *ops) struct insn_emulation *insn; insn = kzalloc(sizeof(*insn), GFP_KERNEL); + if (!insn) + return; + insn->ops = ops; insn->min = INSN_UNDEF; @@ -233,6 +236,8 @@ static void __init register_insn_emulation_sysctl(void) insns_sysctl = kcalloc(nr_insn_emulated + 1, sizeof(*sysctl), GFP_KERNEL); + if (!insns_sysctl) + return; raw_spin_lock_irqsave(&insn_emulation_lock, flags); list_for_each_entry(insn, &insn_emulation, node) { |