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

[linux-2.6-microblaze.git] / arch / sparc / include / uapi / asm / poll.h

diff --git a/arch/sparc/include/uapi/asm/poll.h b/arch/sparc/include/uapi/asm/poll.h
index 2a81e79..72356c9 100644 (file)
--- a/arch/sparc/include/uapi/asm/poll.h
+++ b/arch/sparc/include/uapi/asm/poll.h
@@ -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>