diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-11-29 19:00:41 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-11-29 19:00:41 -0500 |
| commit | c71d227fc4133f949dae620ed5e3a250b43f2415 (patch) | |
| tree | ce12b907996c2acd37e9d86f4ba492b09a0ab0f8 /arch/frv | |
| parent | 69112736e2f025ff3ba280cf81c36e25cf7cc59f (diff) | |
| download | linux-c71d227fc4133f949dae620ed5e3a250b43f2415.tar.gz linux-c71d227fc4133f949dae620ed5e3a250b43f2415.tar.bz2 linux-c71d227fc4133f949dae620ed5e3a250b43f2415.zip | |
make kernel-side POLL... arch-independent
mangle/demangle on the way to/from userland
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/frv')
| -rw-r--r-- | arch/frv/include/uapi/asm/poll.h | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/arch/frv/include/uapi/asm/poll.h b/arch/frv/include/uapi/asm/poll.h index d7053ada7c69..a44c8f0ebee7 100644 --- a/arch/frv/include/uapi/asm/poll.h +++ b/arch/frv/include/uapi/asm/poll.h @@ -2,12 +2,27 @@ #ifndef _ASM_POLL_H #define _ASM_POLL_H +#ifndef __KERNEL__ #define POLLWRNORM POLLOUT #define POLLWRBAND (__force __poll_t)256 +#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 */ + return (v & ~0x300) | ((v & 0x200) >> 1) | ((v & 0x100) >> 6); +} -#include <asm-generic/poll.h> +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)); +} +#endif +#include <asm-generic/poll.h> #undef POLLREMOVE #endif - |