diff options
author | David Howells <dhowells@redhat.com> | 2012-10-13 05:46:48 -0400 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2012-10-13 05:46:48 -0400 |
commit | 607ca46e97a1b6594b29647d98a32d545c24bdff (patch) | |
tree | 30f4c0784bfddb57332cdc0678bd06d1e77fa185 /include/linux/poll.h | |
parent | 08cce05c5a91f5017f4edc9866cf026908c73f9f (diff) |
UAPI: (Scripted) Disintegrate include/linux
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'include/linux/poll.h')
-rw-r--r-- | include/linux/poll.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/poll.h b/include/linux/poll.h index 48fe8bc398d1..c08386fb3e08 100644 --- a/include/linux/poll.h +++ b/include/linux/poll.h | |||
@@ -1,9 +1,6 @@ | |||
1 | #ifndef _LINUX_POLL_H | 1 | #ifndef _LINUX_POLL_H |
2 | #define _LINUX_POLL_H | 2 | #define _LINUX_POLL_H |
3 | 3 | ||
4 | #include <asm/poll.h> | ||
5 | |||
6 | #ifdef __KERNEL__ | ||
7 | 4 | ||
8 | #include <linux/compiler.h> | 5 | #include <linux/compiler.h> |
9 | #include <linux/ktime.h> | 6 | #include <linux/ktime.h> |
@@ -12,6 +9,7 @@ | |||
12 | #include <linux/fs.h> | 9 | #include <linux/fs.h> |
13 | #include <linux/sysctl.h> | 10 | #include <linux/sysctl.h> |
14 | #include <asm/uaccess.h> | 11 | #include <asm/uaccess.h> |
12 | #include <uapi/linux/poll.h> | ||
15 | 13 | ||
16 | extern struct ctl_table epoll_table[]; /* for sysctl */ | 14 | extern struct ctl_table epoll_table[]; /* for sysctl */ |
17 | /* ~832 bytes of stack space used max in sys_select/sys_poll before allocating | 15 | /* ~832 bytes of stack space used max in sys_select/sys_poll before allocating |
@@ -163,6 +161,4 @@ extern int core_sys_select(int n, fd_set __user *inp, fd_set __user *outp, | |||
163 | 161 | ||
164 | extern int poll_select_set_timeout(struct timespec *to, long sec, long nsec); | 162 | extern int poll_select_set_timeout(struct timespec *to, long sec, long nsec); |
165 | 163 | ||
166 | #endif /* KERNEL */ | ||
167 | |||
168 | #endif /* _LINUX_POLL_H */ | 164 | #endif /* _LINUX_POLL_H */ |