diff options
| author | James Simmons <jsimmons@maxwell.earthlink.net> | 2003-04-10 17:39:02 -0700 |
|---|---|---|
| committer | James Simmons <jsimmons@maxwell.earthlink.net> | 2003-04-10 17:39:02 -0700 |
| commit | b493644965283a23ee825e1b7136c6b75a7ac220 (patch) | |
| tree | bced36344161255b253a1438e5ee81d6a7fbe8e5 /include/linux | |
| parent | 470d3cc3e526f2ebcc63d2ce2cc8d1a5e615564f (diff) | |
| parent | d55d7cdf3461a5f8254ed9deb5ceaf25aa20d857 (diff) | |
Merge maxwell.earthlink.net:/usr/src/linus-2.5
into maxwell.earthlink.net:/usr/src/fbdev-2.5
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/poll.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/poll.h b/include/linux/poll.h index 0e4f055588b3..b4bb681fd1ca 100644 --- a/include/linux/poll.h +++ b/include/linux/poll.h @@ -67,7 +67,7 @@ typedef struct { * Use "unsigned long" accesses to let user-mode fd_set's be long-aligned. */ static inline -int get_fd_set(unsigned long nr, void *ufdset, unsigned long *fdset) +int get_fd_set(unsigned long nr, void __user *ufdset, unsigned long *fdset) { nr = FDS_BYTES(nr); if (ufdset) { @@ -82,7 +82,7 @@ int get_fd_set(unsigned long nr, void *ufdset, unsigned long *fdset) } static inline -void set_fd_set(unsigned long nr, void *ufdset, unsigned long *fdset) +void set_fd_set(unsigned long nr, void __user *ufdset, unsigned long *fdset) { if (ufdset) __copy_to_user(ufdset, fdset, FDS_BYTES(nr)); |