diff options
author | Jakub Kicinski <kuba@kernel.org> | 2021-04-17 10:42:54 -0700 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2021-04-17 11:08:07 -0700 |
commit | 8203c7ce4ef2840929d38b447b4ccd384727f92b (patch) | |
tree | 07b4079057e035a4063788f120665f5e42967e8e /arch/riscv/mm/fault.c | |
parent | 474f459360399c5becfd0f189a8894e9e17ad3d3 (diff) | |
parent | 88a5af943985fb43b4c9472b5abd9c0b9705533d (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
- keep the ZC code, drop the code related to reinit
net/bridge/netfilter/ebtables.c
- fix build after move to net_generic
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'arch/riscv/mm/fault.c')
-rw-r--r-- | arch/riscv/mm/fault.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/riscv/mm/fault.c b/arch/riscv/mm/fault.c index 8f17519208c7..c5dbd55cbf7c 100644 --- a/arch/riscv/mm/fault.c +++ b/arch/riscv/mm/fault.c @@ -328,3 +328,4 @@ good_area: } return; } +NOKPROBE_SYMBOL(do_page_fault); |