diff options
| author | David S. Miller <davem@davemloft.net> | 2020-06-26 04:29:51 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-06-26 04:29:51 +0200 |
| commit | 7bed14551659875e1cd23a7c0266394a29a773b3 (patch) | |
| tree | 2bbd8b1b2b1610d2e48a71bf7bb5f41ac5e1d0ef /arch/sh/kernel/traps.c | |
| parent | sch_cake: add RFC 8622 LE PHB support to CAKE diffserv handling (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| download | linux-7bed14551659875e1cd23a7c0266394a29a773b3.tar.xz linux-7bed14551659875e1cd23a7c0266394a29a773b3.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor overlapping changes in xfrm_device.c, between the double
ESP trailing bug fix setting the XFRM_INIT flag and the changes
in net-next preparing for bonding encryption support.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sh/kernel/traps.c')
| -rw-r--r-- | arch/sh/kernel/traps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c index a33025451fcd..9c3d32b80038 100644 --- a/arch/sh/kernel/traps.c +++ b/arch/sh/kernel/traps.c @@ -118,7 +118,7 @@ int is_valid_bugaddr(unsigned long addr) if (addr < PAGE_OFFSET) return 0; - if (probe_kernel_address((insn_size_t *)addr, opcode)) + if (get_kernel_nofault(opcode, (insn_size_t *)addr)) return 0; if (opcode == TRAPA_BUG_OPCODE) return 1; |