fix POLLWRNORM and POLLWRBAND on mips

these macros have the same distinct definition on blackfin, frv, m68k,
mips, sparc and xtensa kernels. POLLMSG and POLLRDHUP additionally
differ on sparc.

diff --git a/arch/arm/bits/poll.h b/arch/arm/bits/poll.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/arch/i386/bits/poll.h b/arch/i386/bits/poll.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/arch/microblaze/bits/poll.h b/arch/microblaze/bits/poll.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/arch/mips/bits/poll.h b/arch/mips/bits/poll.h
new file mode 100644 (file)
index 0000000..b0b1ed6
--- /dev/null
+++ b/arch/mips/bits/poll.h
@@ -0,0 +1,2 @@
+#define POLLWRNORM POLLOUT
+#define POLLWRBAND 0x100

diff --git a/arch/or1k/bits/poll.h b/arch/or1k/bits/poll.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/arch/powerpc/bits/poll.h b/arch/powerpc/bits/poll.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/arch/sh/bits/poll.h b/arch/sh/bits/poll.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/arch/x32/bits/poll.h b/arch/x32/bits/poll.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/arch/x86_64/bits/poll.h b/arch/x86_64/bits/poll.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/include/poll.h b/include/poll.h
index 9a785307a39f1489550a53e08a0eab860ea98708..5979f7ab7e4ebdf95539f77ec9efa029ea82110b 100644 (file)
--- a/include/poll.h
+++ b/include/poll.h
@@ -7,6 +7,8 @@ extern "C" {
 
 #include <features.h>
 
+#include <bits/poll.h>
+
 #define POLLIN     0x001
 #define POLLPRI    0x002
 #define POLLOUT    0x004
@@ -15,10 +17,14 @@ extern "C" {
 #define POLLNVAL   0x020
 #define POLLRDNORM 0x040
 #define POLLRDBAND 0x080
+#ifndef POLLWRNORM
 #define POLLWRNORM 0x100
 #define POLLWRBAND 0x200
+#endif
+#ifndef POLLMSG
 #define POLLMSG    0x400
 #define POLLRDHUP  0x2000
+#define
 
 typedef unsigned long nfds_t;