diff --git a/[refs] b/[refs]
index 0bf462b75b90..2106cded1650 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93870d76fee22e887aa6e7e1fc904dbeca976928
+refs/heads/master: d300a41ef1c39cc5e6b90fd8834ea7ab16b5c48f
diff --git a/trunk/net/sunrpc/auth.c b/trunk/net/sunrpc/auth.c
index 95afe79dd9d7..0667a36aee78 100644
--- a/trunk/net/sunrpc/auth.c
+++ b/trunk/net/sunrpc/auth.c
@@ -270,6 +270,8 @@ rpcauth_cache_shrinker(int nr_to_scan, gfp_t gfp_mask)
 	LIST_HEAD(free);
 	int res;
 
+	if ((gfp_mask & GFP_KERNEL) != GFP_KERNEL)
+		return (nr_to_scan == 0) ? 0 : -1;
 	if (list_empty(&cred_unused))
 		return 0;
 	spin_lock(&rpc_credcache_lock);