- uint64_t -> u64 - int64_t -> s64 - rename local var `s32' to `ss32'. The former is slightly risky. Cc: David Woodhouse Signed-off-by: Andrew Morton --- fs/compat.c | 30 ++++++++++++++--------------- fs/select.c | 42 ++++++++++++++++++++--------------------- include/linux/poll.h | 6 ++--- 3 files changed, 39 insertions(+), 39 deletions(-) diff -puN fs/compat.c~add-pselect-ppoll-system-call-implementation-rename-types fs/compat.c --- devel/fs/compat.c~add-pselect-ppoll-system-call-implementation-rename-types 2006-01-11 17:27:35.000000000 -0800 +++ devel-akpm/fs/compat.c 2006-01-11 17:27:35.000000000 -0800 @@ -1660,7 +1660,7 @@ static void select_bits_free(void *bits, ((unsigned long) (MAX_SCHEDULE_TIMEOUT / HZ)-1) int compat_core_sys_select(int n, compat_ulong_t __user *inp, - compat_ulong_t __user *outp, compat_ulong_t __user *exp, int64_t *timeout) + compat_ulong_t __user *outp, compat_ulong_t __user *exp, s64 *timeout) { fd_set_bits fds; char *bits; @@ -1728,7 +1728,7 @@ asmlinkage long compat_sys_select(int n, compat_ulong_t __user *outp, compat_ulong_t __user *exp, struct compat_timeval __user *tvp) { - int64_t timeout = -1; + s64 timeout = -1; struct compat_timeval tv; int ret; @@ -1739,8 +1739,8 @@ asmlinkage long compat_sys_select(int n, if (tv.tv_sec < 0 || tv.tv_usec < 0) return -EINVAL; - /* Cast to uint64_t to make GCC stop complaining */ - if ((uint64_t)tv.tv_sec >= (uint64_t)MAX_INT64_SECONDS) + /* Cast to u64 to make GCC stop complaining */ + if ((u64)tv.tv_sec >= (u64)MAX_INT64_SECONDS) timeout = -1; /* infinite */ else { timeout = ROUND_UP(tv.tv_sec, 1000000/HZ); @@ -1753,7 +1753,7 @@ asmlinkage long compat_sys_select(int n, if (tvp) { if (current->personality & STICKY_TIMEOUTS) goto sticky; - tv.tv_usec = jiffies_to_usecs(do_div((*(uint64_t*)&timeout), HZ)); + tv.tv_usec = jiffies_to_usecs(do_div((*(u64*)&timeout), HZ)); tv.tv_sec = timeout; if (copy_to_user(tvp, &tv, sizeof(tv))) { sticky: @@ -1779,7 +1779,7 @@ asmlinkage long compat_sys_pselect7(int struct compat_timespec __user *tsp, compat_sigset_t __user *sigmask, compat_size_t sigsetsize) { - compat_sigset_t s32; + compat_sigset_t ss32; sigset_t ksigmask, sigsaved; long timeout = MAX_SCHEDULE_TIMEOUT; struct compat_timespec ts; @@ -1796,9 +1796,9 @@ asmlinkage long compat_sys_pselect7(int if (sigmask) { if (sigsetsize != sizeof(compat_sigset_t)) return -EINVAL; - if (copy_from_user(&s32, sigmask, sizeof(s32))) + if (copy_from_user(&ss32, sigmask, sizeof(ss32))) return -EFAULT; - sigset_from_compat(&ksigmask, &s32); + sigset_from_compat(&ksigmask, &ss32); sigdelsetmask(&ksigmask, sigmask(SIGKILL)|sigmask(SIGSTOP)); sigprocmask(SIG_SETMASK, &ksigmask, &sigsaved); @@ -1867,10 +1867,10 @@ asmlinkage long compat_sys_ppoll(struct unsigned int nfds, struct compat_timespec __user *tsp, const compat_sigset_t __user *sigmask, compat_size_t sigsetsize) { - compat_sigset_t s32; + compat_sigset_t ss32; sigset_t ksigmask, sigsaved; struct compat_timespec ts; - int64_t timeout = -1; + s64 timeout = -1; int ret; if (tsp) { @@ -1879,7 +1879,7 @@ asmlinkage long compat_sys_ppoll(struct /* We assume that ts.tv_sec is always lower than the number of seconds that can be expressed in - an int64_t. Otherwise the compiler bitches at us */ + an s64. Otherwise the compiler bitches at us */ timeout = ROUND_UP(ts.tv_sec, 1000000000/HZ); timeout += ts.tv_sec * HZ; } @@ -1887,9 +1887,9 @@ asmlinkage long compat_sys_ppoll(struct if (sigmask) { if (sigsetsize |= sizeof(compat_sigset_t)) return -EINVAL; - if (copy_from_user(&s32, sigmask, sizeof(s32))) + if (copy_from_user(&ss32, sigmask, sizeof(ss32))) return -EFAULT; - sigset_from_compat(&ksigmask, &s32); + sigset_from_compat(&ksigmask, &ss32); sigdelsetmask(&ksigmask, sigmask(SIGKILL)|sigmask(SIGSTOP)); sigprocmask(SIG_SETMASK, &ksigmask, &sigsaved); @@ -1912,8 +1912,8 @@ asmlinkage long compat_sys_ppoll(struct if (tsp && timeout >= 0) { if (current->personality & STICKY_TIMEOUTS) goto sticky; - /* Yes, we know it's actually an int64_t, but it's also positive. */ - ts.tv_nsec = jiffies_to_usecs(do_div((*(uint64_t*)&timeout), HZ)) * 1000; + /* Yes, we know it's actually an s64, but it's also positive. */ + ts.tv_nsec = jiffies_to_usecs(do_div((*(u64*)&timeout), HZ)) * 1000; ts.tv_sec = timeout; if (copy_to_user(tsp, &ts, sizeof(ts))) { sticky: diff -puN fs/select.c~add-pselect-ppoll-system-call-implementation-rename-types fs/select.c --- devel/fs/select.c~add-pselect-ppoll-system-call-implementation-rename-types 2006-01-11 17:27:35.000000000 -0800 +++ devel-akpm/fs/select.c 2006-01-11 17:27:35.000000000 -0800 @@ -179,7 +179,7 @@ get_max: #define POLLOUT_SET (POLLWRBAND | POLLWRNORM | POLLOUT | POLLERR) #define POLLEX_SET (POLLPRI) -int do_select(int n, fd_set_bits *fds, int64_t *timeout) +int do_select(int n, fd_set_bits *fds, s64 *timeout) { struct poll_wqueues table; poll_table *wait; @@ -265,7 +265,7 @@ int do_select(int n, fd_set_bits *fds, i if (*timeout < 0) { /* Wait indefinitely */ __timeout = MAX_SCHEDULE_TIMEOUT; - } else if (unlikely(*timeout >= (int64_t)MAX_SCHEDULE_TIMEOUT - 1)) { + } else if (unlikely(*timeout >= (s64)MAX_SCHEDULE_TIMEOUT - 1)) { /* Wait for longer than MAX_SCHEDULE_TIMEOUT. Do it in a loop */ __timeout = MAX_SCHEDULE_TIMEOUT - 1; *timeout -= __timeout; @@ -306,7 +306,7 @@ static void select_bits_free(void *bits, ((unsigned long) (MAX_SCHEDULE_TIMEOUT / HZ)-1) static int core_sys_select(int n, fd_set __user *inp, fd_set __user *outp, - fd_set __user *exp, int64_t *timeout) + fd_set __user *exp, s64 *timeout) { fd_set_bits fds; char *bits; @@ -375,7 +375,7 @@ out_nofds: asmlinkage long sys_select(int n, fd_set __user *inp, fd_set __user *outp, fd_set __user *exp, struct timeval __user *tvp) { - int64_t timeout = -1; + s64 timeout = -1; struct timeval tv; int ret; @@ -386,8 +386,8 @@ asmlinkage long sys_select(int n, fd_set if (tv.tv_sec < 0 || tv.tv_usec < 0) return -EINVAL; - /* Cast to uint64_t to make GCC stop complaining */ - if ((uint64_t)tv.tv_sec >= (uint64_t)MAX_INT64_SECONDS) + /* Cast to u64 to make GCC stop complaining */ + if ((u64)tv.tv_sec >= (u64)MAX_INT64_SECONDS) timeout = -1; /* infinite */ else { timeout = ROUND_UP(tv.tv_sec, 1000000/HZ); @@ -400,7 +400,7 @@ asmlinkage long sys_select(int n, fd_set if (tvp) { if (current->personality & STICKY_TIMEOUTS) goto sticky; - tv.tv_usec = jiffies_to_usecs(do_div((*(uint64_t*)&timeout), HZ)); + tv.tv_usec = jiffies_to_usecs(do_div((*(u64*)&timeout), HZ)); tv.tv_sec = timeout; if (copy_to_user(tvp, &tv, sizeof(tv))) { sticky: @@ -425,7 +425,7 @@ asmlinkage long sys_pselect7(int n, fd_s fd_set __user *exp, struct timespec __user *tsp, const sigset_t __user *sigmask, size_t sigsetsize) { - int64_t timeout = MAX_SCHEDULE_TIMEOUT; + s64 timeout = MAX_SCHEDULE_TIMEOUT; sigset_t ksigmask, sigsaved; struct timespec ts; int ret; @@ -437,8 +437,8 @@ asmlinkage long sys_pselect7(int n, fd_s if (ts.tv_sec < 0 || ts.tv_nsec < 0) return -EINVAL; - /* Cast to uint64_t to make GCC stop complaining */ - if ((uint64_t)ts.tv_sec >= (uint64_t)MAX_INT64_SECONDS) + /* Cast to u64 to make GCC stop complaining */ + if ((u64)ts.tv_sec >= (u64)MAX_INT64_SECONDS) timeout = -1; /* infinite */ else { timeout = ROUND_UP(ts.tv_sec, 1000000000/HZ); @@ -462,7 +462,7 @@ asmlinkage long sys_pselect7(int n, fd_s if (tsp) { if (current->personality & STICKY_TIMEOUTS) goto sticky; - ts.tv_nsec = jiffies_to_usecs(do_div((*(uint64_t*)&timeout), HZ)) * 1000; + ts.tv_nsec = jiffies_to_usecs(do_div((*(u64*)&timeout), HZ)) * 1000; ts.tv_sec = timeout; if (copy_to_user(tsp, &ts, sizeof(ts))) { sticky: @@ -557,7 +557,7 @@ static void do_pollfd(unsigned int num, } static int do_poll(unsigned int nfds, struct poll_list *list, - struct poll_wqueues *wait, int64_t *timeout) + struct poll_wqueues *wait, s64 *timeout) { int count = 0; poll_table* pt = &wait->pt; @@ -586,7 +586,7 @@ static int do_poll(unsigned int nfds, s if (*timeout < 0) { /* Wait indefinitely */ __timeout = MAX_SCHEDULE_TIMEOUT; - } else if (unlikely(*timeout >= (int64_t)MAX_SCHEDULE_TIMEOUT - 1)) { + } else if (unlikely(*timeout >= (s64)MAX_SCHEDULE_TIMEOUT - 1)) { /* Wait for longer than MAX_SCHEDULE_TIMEOUT. Do it in a loop */ __timeout = MAX_SCHEDULE_TIMEOUT - 1; *timeout -= __timeout; @@ -603,7 +603,7 @@ static int do_poll(unsigned int nfds, s return count; } -int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds, int64_t *timeout) +int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds, s64 *timeout) { struct poll_wqueues table; int fdcount, err; @@ -683,12 +683,12 @@ out_fds: asmlinkage long sys_poll(struct pollfd __user *ufds, unsigned int nfds, long timeout_msecs) { - int64_t timeout_jiffies = 0; + s64 timeout_jiffies = 0; if (timeout_msecs) { #if HZ > 1000 /* We can only overflow if HZ > 1000 */ - if (timeout_msecs / 1000 > (int64_t)0x7fffffffffffffffULL / (int64_t)HZ) + if (timeout_msecs / 1000 > (s64)0x7fffffffffffffffULL / (s64)HZ) timeout_jiffies = -1; else #endif @@ -705,15 +705,15 @@ asmlinkage long sys_ppoll(struct pollfd { sigset_t ksigmask, sigsaved; struct timespec ts; - int64_t timeout = -1; + s64 timeout = -1; int ret; if (tsp) { if (copy_from_user(&ts, tsp, sizeof(ts))) return -EFAULT; - /* Cast to uint64_t to make GCC stop complaining */ - if ((uint64_t)ts.tv_sec >= (uint64_t)MAX_INT64_SECONDS) + /* Cast to u64 to make GCC stop complaining */ + if ((u64)ts.tv_sec >= (u64)MAX_INT64_SECONDS) timeout = -1; /* infinite */ else { timeout = ROUND_UP(ts.tv_sec, 1000000000/HZ); @@ -749,8 +749,8 @@ asmlinkage long sys_ppoll(struct pollfd if (tsp && timeout >= 0) { if (current->personality & STICKY_TIMEOUTS) goto sticky; - /* Yes, we know it's actually an int64_t, but it's also positive. */ - ts.tv_nsec = jiffies_to_usecs(do_div((*(uint64_t*)&timeout), HZ)) * 1000; + /* Yes, we know it's actually an s64, but it's also positive. */ + ts.tv_nsec = jiffies_to_usecs(do_div((*(u64*)&timeout), HZ)) * 1000; ts.tv_sec = timeout; if (copy_to_user(tsp, &ts, sizeof(ts))) { sticky: diff -puN include/linux/poll.h~add-pselect-ppoll-system-call-implementation-rename-types include/linux/poll.h --- devel/include/linux/poll.h~add-pselect-ppoll-system-call-implementation-rename-types 2006-01-11 17:27:35.000000000 -0800 +++ devel-akpm/include/linux/poll.h 2006-01-11 17:27:35.000000000 -0800 @@ -92,11 +92,11 @@ void zero_fd_set(unsigned long nr, unsig memset(fdset, 0, FDS_BYTES(nr)); } -#define MAX_INT64_SECONDS (((int64_t)(~((uint64_t)0)>>1)/HZ)-1) +#define MAX_INT64_SECONDS (((s64)(~((u64)0)>>1)/HZ)-1) -extern int do_select(int n, fd_set_bits *fds, int64_t *timeout); +extern int do_select(int n, fd_set_bits *fds, s64 *timeout); extern int do_sys_poll(struct pollfd __user * ufds, unsigned int nfds, - int64_t *timeout); + s64 *timeout); #endif /* KERNEL */ _