diff options
| author | Alexander Viro <viro@parcelfarce.linux.theplanet.co.uk> | 2004-07-13 19:37:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-07-13 19:37:49 -0700 |
| commit | 0056bf1e5bc48e11a3f0098e25ef3ac38cd7d7c3 (patch) | |
| tree | 0a0763d65b4852a3bf342d5abd662708e37f3503 | |
| parent | 64ed7893dcf7086505c124dc19be0eb284f76282 (diff) | |
[PATCH] pointer-to-int done the canonical way
Extraction of int from pointer is slightly broken in several places.
| -rw-r--r-- | drivers/atm/idt77105.c | 2 | ||||
| -rw-r--r-- | drivers/atm/suni.c | 2 | ||||
| -rw-r--r-- | drivers/atm/uPD98402.c | 4 | ||||
| -rw-r--r-- | kernel/futex.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/atm/idt77105.c b/drivers/atm/idt77105.c index c1fb6c710617..0747dbadbcf1 100644 --- a/drivers/atm/idt77105.c +++ b/drivers/atm/idt77105.c @@ -198,7 +198,7 @@ static int idt77105_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg) case IDT77105_GETSTAT: return fetch_stats(dev, arg, cmd == IDT77105_GETSTATZ); case ATM_SETLOOP: - return set_loopback(dev,(int) (long) arg); + return set_loopback(dev,(int)(unsigned long) arg); case ATM_GETLOOP: return put_user(PRIV(dev)->loop_mode,(int __user *)arg) ? -EFAULT : 0; diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c index e5a0f5cbdc21..678df94184dc 100644 --- a/drivers/atm/suni.c +++ b/drivers/atm/suni.c @@ -196,7 +196,7 @@ static int suni_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg) case SONET_GETFRSENSE: return -EINVAL; case ATM_SETLOOP: - return set_loopback(dev,(int) (long) arg); + return set_loopback(dev,(int)(unsigned long)arg); case ATM_GETLOOP: return put_user(PRIV(dev)->loop_mode,(int __user *)arg) ? -EFAULT : 0; diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c index da33eaddc808..9504cce51bfb 100644 --- a/drivers/atm/uPD98402.c +++ b/drivers/atm/uPD98402.c @@ -140,14 +140,14 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg) case SONET_GETSTAT: return fetch_stats(dev,arg, cmd == SONET_GETSTATZ); case SONET_SETFRAMING: - return set_framing(dev,(int) (long) arg); + return set_framing(dev, (int)(unsigned long)arg); case SONET_GETFRAMING: return put_user(PRIV(dev)->framing,(int __user *)arg) ? -EFAULT : 0; case SONET_GETFRSENSE: return get_sense(dev,arg); case ATM_SETLOOP: - return set_loopback(dev,(int) (long) arg); + return set_loopback(dev, (int)(unsigned long)arg); case ATM_GETLOOP: return put_user(PRIV(dev)->loop_mode,(int __user *)arg) ? -EFAULT : 0; diff --git a/kernel/futex.c b/kernel/futex.c index d9b9694fd2e8..9a25d76bd6bd 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -704,7 +704,7 @@ asmlinkage long sys_futex(u32 __user *uaddr, int op, int val, * requeue parameter in 'utime' if op == FUTEX_REQUEUE. */ if (op >= FUTEX_REQUEUE) - val2 = (int) (long) utime; + val2 = (int) (unsigned long) utime; return do_futex((unsigned long)uaddr, op, val, timeout, (unsigned long)uaddr2, val2, val3); |