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

Commit 7a163b21 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

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



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: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a9a08845

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

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

#define _UAPI__BFIN_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

#define POLLWRBAND	256



#include <asm-generic/poll.h>

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

+1 −18
Original line number Diff line number Diff line
@@ -2,25 +2,8 @@ 
#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);

}



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

#define POLLWRBAND	256



#include <asm-generic/poll.h>

#undef POLLREMOVE

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

+1 −18
Original line number Diff line number Diff line
@@ -2,25 +2,8 @@ 
#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

#define POLLWRBAND	256



#include <asm-generic/poll.h>

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

+1 −18
Original line number Diff line number Diff line
@@ -2,25 +2,8 @@ 
#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

#define POLLWRBAND	0x0100



#include <asm-generic/poll.h>

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

+4 −24
Original line number Diff line number Diff line
@@ -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>