diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-06-28 16:54:05 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-06-28 16:54:05 +1000 |
| commit | 5f9df76887bf8170e8844f1907c13fbbb30e9c36 (patch) | |
| tree | 3b940f7e1c36605af69ffe3a3e9bc8fa53bd12a1 /net | |
| parent | 8f850ad6cf932b8b5125f9585cb397e08403cccd (diff) | |
| parent | 84b494dcbcc015419e629ced664d3b737e83336e (diff) | |
| download | linux-next-akpm-base.tar.gz linux-next-akpm-base.zip | |
# Conflicts:
# include/linux/pagevec.h
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/page_pool.c | 2 | ||||
| -rw-r--r-- | net/sunrpc/auth.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/core/page_pool.c b/net/core/page_pool.c index f18e6e771993..db70e94c8df2 100644 --- a/net/core/page_pool.c +++ b/net/core/page_pool.c @@ -16,7 +16,7 @@ #include <linux/dma-direction.h> #include <linux/dma-mapping.h> #include <linux/page-flags.h> -#include <linux/mm.h> /* for __put_page() */ +#include <linux/mm.h> /* for put_page() */ #include <linux/poison.h> #include <linux/ethtool.h> diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c index 682fcd24bf43..04e7b55fe0d9 100644 --- a/net/sunrpc/auth.c +++ b/net/sunrpc/auth.c @@ -874,7 +874,7 @@ int __init rpcauth_init_module(void) err = rpc_init_authunix(); if (err < 0) goto out1; - err = register_shrinker(&rpc_cred_shrinker); + err = register_shrinker(&rpc_cred_shrinker, "sunrpc_cred"); if (err < 0) goto out2; return 0; |