From 14b14fa765fb136f129af9b7e844c651a5c4383e Mon Sep 17 00:00:00 2001
From: Trutz Behn <me@trutz.be>
Date: Fri, 13 Feb 2015 18:10:52 +0100
Subject: 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.

(cherry picked from commit f5011c62c3329f15652a60b6b2300d7e3f570977)
---
 arch/arm/bits/poll.h        | 0
 arch/i386/bits/poll.h       | 0
 arch/microblaze/bits/poll.h | 0
 arch/mips/bits/poll.h       | 2 ++
 arch/powerpc/bits/poll.h    | 0
 arch/sh/bits/poll.h         | 0
 arch/x32/bits/poll.h        | 0
 arch/x86_64/bits/poll.h     | 0
 include/poll.h              | 6 ++++++
 9 files changed, 8 insertions(+)
 create mode 100644 arch/arm/bits/poll.h
 create mode 100644 arch/i386/bits/poll.h
 create mode 100644 arch/microblaze/bits/poll.h
 create mode 100644 arch/mips/bits/poll.h
 create mode 100644 arch/powerpc/bits/poll.h
 create mode 100644 arch/sh/bits/poll.h
 create mode 100644 arch/x32/bits/poll.h
 create mode 100644 arch/x86_64/bits/poll.h

diff --git a/arch/arm/bits/poll.h b/arch/arm/bits/poll.h
new file mode 100644
index 00000000..e69de29b
diff --git a/arch/i386/bits/poll.h b/arch/i386/bits/poll.h
new file mode 100644
index 00000000..e69de29b
diff --git a/arch/microblaze/bits/poll.h b/arch/microblaze/bits/poll.h
new file mode 100644
index 00000000..e69de29b
diff --git a/arch/mips/bits/poll.h b/arch/mips/bits/poll.h
new file mode 100644
index 00000000..b0b1ed62
--- /dev/null
+++ b/arch/mips/bits/poll.h
@@ -0,0 +1,2 @@
+#define POLLWRNORM POLLOUT
+#define POLLWRBAND 0x100
diff --git a/arch/powerpc/bits/poll.h b/arch/powerpc/bits/poll.h
new file mode 100644
index 00000000..e69de29b
diff --git a/arch/sh/bits/poll.h b/arch/sh/bits/poll.h
new file mode 100644
index 00000000..e69de29b
diff --git a/arch/x32/bits/poll.h b/arch/x32/bits/poll.h
new file mode 100644
index 00000000..e69de29b
diff --git a/arch/x86_64/bits/poll.h b/arch/x86_64/bits/poll.h
new file mode 100644
index 00000000..e69de29b
diff --git a/include/poll.h b/include/poll.h
index 9a785307..5979f7ab 100644
--- 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;
 
-- 
cgit v1.2.1