Skip to content

Commit da0b9ee

Browse files
arndbRussell King (Oracle)
authored andcommitted
ARM: 9110/1: oabi-compat: fix oabi epoll sparse warning
As my patches change the oabi epoll definition, I received a report from the kernel test robot about a pre-existing issue with a mismatched __poll_t type. The OABI code was correct when it was initially added in linux-2.16, but a later (also correct) change to the generic __poll_t triggered a type mismatch warning from sparse. As __poll_t is always 32-bit bits wide and otherwise compatible, using this instead of __u32 in the oabi_epoll_event definition is a valid workaround. Reported-by: kernel test robot <lkp@intel.com> Fixes: 8ced390 ("define __poll_t, annotate constants") Fixes: ee219b9 ("uapi: turn __poll_t sparse checks on by default") Fixes: 687ad01 ("[ARM] 3109/1: old ABI compat: syscall wrappers for ABI impedance matching") Acked-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
1 parent 8ac6f5d commit da0b9ee

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/arm/kernel/sys_oabi-compat.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ asmlinkage long sys_oabi_fcntl64(unsigned int fd, unsigned int cmd,
274274
}
275275

276276
struct oabi_epoll_event {
277-
__u32 events;
277+
__poll_t events;
278278
__u64 data;
279279
} __attribute__ ((packed,aligned(4)));
280280

0 commit comments

Comments
 (0)