Patch "ARM: 9065/1: OABI compat: fix build when EPOLL is not enabled" has been added to the 5.10-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    ARM: 9065/1: OABI compat: fix build when EPOLL is not enabled

to the 5.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     arm-9065-1-oabi-compat-fix-build-when-epoll-is-not-e.patch
and it can be found in the queue-5.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 0231a3befa7947d05f8f9e348eebb4f8fec95b37
Author: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Date:   Sat Feb 20 19:47:48 2021 +0100

    ARM: 9065/1: OABI compat: fix build when EPOLL is not enabled
    
    [ Upstream commit fd749fe4bcb00ad80d9eece709f804bb4ac6bf1e ]
    
    When CONFIG_EPOLL is not set/enabled, sys_oabi-compat.c has build
    errors. Fix these by surrounding them with ifdef CONFIG_EPOLL/endif
    and providing stubs for the "EPOLL is not set" case.
    
    ../arch/arm/kernel/sys_oabi-compat.c: In function 'sys_oabi_epoll_ctl':
    ../arch/arm/kernel/sys_oabi-compat.c:257:6: error: implicit declaration of function 'ep_op_has_event' [-Werror=implicit-function-declaration]
      257 |  if (ep_op_has_event(op) &&
          |      ^~~~~~~~~~~~~~~
    ../arch/arm/kernel/sys_oabi-compat.c:264:9: error: implicit declaration of function 'do_epoll_ctl'; did you mean 'sys_epoll_ctl'? [-Werror=implicit-function-declaration]
      264 |  return do_epoll_ctl(epfd, op, fd, &kernel, false);
          |         ^~~~~~~~~~~~
    
    Fixes: c281634c8652 ("ARM: compat: remove KERNEL_DS usage in sys_oabi_epoll_ctl()")
    Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
    Reported-by: kernel test robot <lkp@xxxxxxxxx> # from an lkp .config file
    Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
    Cc: Nicolas Pitre <nico@xxxxxxxxxxx>
    Cc: Alexander Viro <viro@xxxxxxxxxxxxxxxxxx>
    Cc: patches@xxxxxxxxxxxxxxx
    Acked-by: Nicolas Pitre <nico@xxxxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/arch/arm/kernel/sys_oabi-compat.c b/arch/arm/kernel/sys_oabi-compat.c
index 0203e545bbc8d..075a2e0ed2c15 100644
--- a/arch/arm/kernel/sys_oabi-compat.c
+++ b/arch/arm/kernel/sys_oabi-compat.c
@@ -248,6 +248,7 @@ struct oabi_epoll_event {
 	__u64 data;
 } __attribute__ ((packed,aligned(4)));
 
+#ifdef CONFIG_EPOLL
 asmlinkage long sys_oabi_epoll_ctl(int epfd, int op, int fd,
 				   struct oabi_epoll_event __user *event)
 {
@@ -298,6 +299,20 @@ asmlinkage long sys_oabi_epoll_wait(int epfd,
 	kfree(kbuf);
 	return err ? -EFAULT : ret;
 }
+#else
+asmlinkage long sys_oabi_epoll_ctl(int epfd, int op, int fd,
+				   struct oabi_epoll_event __user *event)
+{
+	return -EINVAL;
+}
+
+asmlinkage long sys_oabi_epoll_wait(int epfd,
+				    struct oabi_epoll_event __user *events,
+				    int maxevents, int timeout)
+{
+	return -EINVAL;
+}
+#endif
 
 struct oabi_sembuf {
 	unsigned short	sem_num;