From d88cd5c7f07842144cf3493b43a96cb198d76704 Mon Sep 17 00:00:00 2001 From: Todd Kjos Date: Fri, 31 Mar 2023 19:16:49 +0000 Subject: [PATCH] ANDROID: Fix kernelci break: eventfd_signal_mask redefined MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix a merge issue where eventfd_signal_mask() was added twice which resulted in kernelci issues when !CONFIG_EVENTFD: include/linux/eventfd.h:76:19: error: redefinition of ‘eventfd_signal_mask’ Fixes: 4ef66581d7fd ("eventfd: provide a eventfd_signal_mask() helper") Signed-off-by: Todd Kjos Change-Id: Ifdd212e857c2ff76c75283e77b9978e51a96d178 --- include/linux/eventfd.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/linux/eventfd.h b/include/linux/eventfd.h index e8c5dd9c3dac..6cd2a92daf20 100644 --- a/include/linux/eventfd.h +++ b/include/linux/eventfd.h @@ -73,12 +73,6 @@ static inline int eventfd_signal_mask(struct eventfd_ctx *ctx, __u64 n, return -ENOSYS; } -static inline int eventfd_signal_mask(struct eventfd_ctx *ctx, __u64 n, - unsigned mask) -{ - return -ENOSYS; -} - static inline void eventfd_ctx_put(struct eventfd_ctx *ctx) {