xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unify {de,}mangle_poll(), get rid of kernel-side POLL...

Browse Source 
except, again, POLLFREE and POLL_BUSY_LOOP.

With this, we finally get to the promised end result:

 - POLL{IN,OUT,...} are plain integers and *not* in __poll_t, so any
   stray instances of ->poll() still using those will be caught by
   sparse.

 - eventpoll.c and select.c warning-free wrt __poll_t

 - no more kernel-side definitions of POLL... - userland ones are
   visible through the entire kernel (and used pretty much only for
   mangle/demangle)

 - same behavior as after the first series (i.e. sparc et.al. epoll(2)
   working correctly).

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Al Viro
2018-02-01 15:13:18 -05:00
committed by Linus Torvalds
parent a9a08845e9
commit 7a163b2195
8 changed files with 47 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
arch/sparc/include/uapi/asm/poll.h
View File

@@ -2,31 +2,11 @@
#ifndef __SPARC_POLL_H
#define __SPARC_POLL_H
#ifndef __KERNEL__
#define POLLWRNORM POLLOUT
#define POLLWRBAND (__force __poll_t)256
#define POLLMSG (__force __poll_t)512
#define POLLREMOVE (__force __poll_t)1024
#define POLLRDHUP (__force __poll_t)2048
#else
#define __ARCH_HAS_MANGLED_POLL
static inline __u16 mangle_poll(__poll_t val)
{
__u16 v = (__force __u16)val;
/* bit 9 -> bit 8, bit 8 -> bit 2, bit 13 -> bit 11 */
return (v & ~0x300) | ((v & 0x200) >> 1) | ((v & 0x100) >> 6) |
((v & 0x2000) >> 2);
}
static inline __poll_t demangle_poll(__u16 v)
{
/* bit 8 -> bit 9, bit 2 -> bits 2 and 8 */
return (__force __poll_t)((v & ~0x100) | ((v & 0x100) << 1) |
((v & 4) << 6) | ((v & 0x800) << 2));
}
#endif
#define POLLWRBAND 256
#define POLLMSG 512
#define POLLREMOVE 1024
#define POLLRDHUP 2048
#include <asm-generic/poll.h>