Merge branch 'misc.poll' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[sfrench/cifs-2.6.git] / arch / blackfin / include / uapi / asm / poll.h

diff --git a/arch/blackfin/include/uapi/asm/poll.h b/arch/blackfin/include/uapi/asm/poll.h
index 8b094d43e9b72b134bb1844e503bb6a66555ca1b..3b162f2d29703b326ad2583ab04a338a5575a741 100644 (file)
--- a/arch/blackfin/include/uapi/asm/poll.h
+++ b/arch/blackfin/include/uapi/asm/poll.h
@@ -9,8 +9,25 @@
 #ifndef _UAPI__BFIN_POLL_H
 #define _UAPI__BFIN_POLL_H
 
-#define POLLWRNORM     4 /* POLLOUT */
-#define POLLWRBAND     256
+#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>