diff options
author | David Howells <dhowells@redhat.com> | 2012-02-16 12:50:06 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2012-02-19 13:32:28 -0500 |
commit | cf420048b3b2af9ce928d35cc5455c646c9dd2f7 (patch) | |
tree | bccf07db4f8c3f8fd9d0ead38ae53c0b22ed64a6 /include/linux/time.h | |
parent | 1fd36adcd98c14d2fd97f545293c488775cb2823 (diff) |
Delete the __FD_*() funcs for operating on fd_set from linux/time.h
Delete the __FD_*() functions for operating on fd_set structs from
linux/time.h as they're no longer used within the kernel with the preceding
patch and are not exported to userspace.
Whilst linux/time.h *does* export the FD_*() equivalents as wrappers around
__FD_*(), userspace provides its own definition of __FD_*().
Note that the definition of FD_ZERO() in linux/time.h may not be used with the
fd_sets associated with struct fdtable as the fd_set may have been allocated in
a truncated fashion.
Signed-off-by: David Howells <dhowells@redhat.com>
Link: http://lkml.kernel.org/r/20120216175006.23314.18984.stgit@warthog.procyon.org.uk
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include/linux/time.h')
-rw-r--r-- | include/linux/time.h | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/include/linux/time.h b/include/linux/time.h index 93277a0b229..9f43487facd 100644 --- a/include/linux/time.h +++ b/include/linux/time.h | |||
@@ -4,11 +4,8 @@ | |||
4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
5 | 5 | ||
6 | #ifdef __KERNEL__ | 6 | #ifdef __KERNEL__ |
7 | # include <linux/bitops.h> | ||
8 | # include <linux/cache.h> | 7 | # include <linux/cache.h> |
9 | # include <linux/posix_types.h> | ||
10 | # include <linux/seqlock.h> | 8 | # include <linux/seqlock.h> |
11 | # include <linux/string.h> | ||
12 | # include <linux/math64.h> | 9 | # include <linux/math64.h> |
13 | #endif | 10 | #endif |
14 | 11 | ||
@@ -260,26 +257,6 @@ static __always_inline void timespec_add_ns(struct timespec *a, u64 ns) | |||
260 | a->tv_nsec = ns; | 257 | a->tv_nsec = ns; |
261 | } | 258 | } |
262 | 259 | ||
263 | static inline void __FD_SET(unsigned long __fd, __kernel_fd_set *__fdsetp) | ||
264 | { | ||
265 | __set_bit(__fd, __fdsetp->fds_bits); | ||
266 | } | ||
267 | |||
268 | static inline void __FD_CLR(unsigned long __fd, __kernel_fd_set *__fdsetp) | ||
269 | { | ||
270 | __clear_bit(__fd, __fdsetp->fds_bits); | ||
271 | } | ||
272 | |||
273 | static inline int __FD_ISSET(unsigned long __fd, const __kernel_fd_set *__fdsetp) | ||
274 | { | ||
275 | return test_bit(__fd, __fdsetp->fds_bits); | ||
276 | } | ||
277 | |||
278 | static inline void __FD_ZERO(__kernel_fd_set *__fdsetp) | ||
279 | { | ||
280 | memset(__fdsetp->fds_bits, 0, sizeof __fdsetp->fds_bits); | ||
281 | } | ||
282 | |||
283 | #endif /* __KERNEL__ */ | 260 | #endif /* __KERNEL__ */ |
284 | 261 | ||
285 | #define NFDBITS __NFDBITS | 262 | #define NFDBITS __NFDBITS |