From: Andrew Morton <akpm@linux-foundation.org>
Date: Tue, 24 Aug 2021 00:00:00 +0000 (+1000)
Subject: fs-epoll-use-a-per-cpu-counter-for-users-watches-count-fix-fix
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4fbc3ac1e771e1388ef947579012d3ec3bcafb27;p=users%2Fjedix%2Flinux-maple.git

fs-epoll-use-a-per-cpu-counter-for-users-watches-count-fix-fix

tweak user_epoll_alloc(), per Guenter

Link: https://lkml.kernel.org/r/20210804191421.GA1900577@roeck-us.net
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Mark Brown <broonie@kernel.org>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---

diff --git a/kernel/user.c b/kernel/user.c
index 57d53568cb33..e2cf8c22b539 100644
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -133,8 +133,9 @@ static int user_epoll_alloc(struct user_struct *up)
 {
 #ifdef CONFIG_EPOLL
 	return percpu_counter_init(&up->epoll_watches, 0, GFP_KERNEL);
-#endif
+#else
 	return 0;
+#endif
 }
 
 static void user_epoll_free(struct user_struct *up)