Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c71d227f authored by Al Viro's avatar Al Viro
Browse files

make kernel-side POLL... arch-independent 



mangle/demangle on the way to/from userland

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 69112736

arch/blackfin/include/uapi/asm/poll.h

+18 −1
Original line number Diff line number Diff line
@@ -9,8 +9,25 @@ 
#ifndef _UAPI__BFIN_POLL_H

#define _UAPI__BFIN_POLL_H



#define POLLWRNORM	(__force __poll_t)4 /* POLLOUT */

#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);

}



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>

arch/frv/include/uapi/asm/poll.h

+17 −2
Original line number Diff line number Diff line
@@ -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

arch/m68k/include/uapi/asm/poll.h

+17 −0
Original line number Diff line number Diff line
@@ -2,8 +2,25 @@ 
#ifndef __m68k_POLL_H

#define __m68k_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);

}



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>

arch/mips/include/uapi/asm/poll.h

+17 −0
Original line number Diff line number Diff line
@@ -2,8 +2,25 @@ 
#ifndef __ASM_POLL_H

#define __ASM_POLL_H



#ifndef __KERNEL__

#define POLLWRNORM	POLLOUT

#define POLLWRBAND	(__force __poll_t)0x0100

#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);

}



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>

arch/sparc/include/uapi/asm/poll.h

+20 −0
Original line number Diff line number Diff line
@@ -2,11 +2,31 @@ 
#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



#include <asm-generic/poll.h>