diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 20:21:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 20:21:17 -0400 |
| commit | 946e91f36e90eea46758dd725b1c3b239f270f68 (patch) | |
| tree | 564ad819af4abab3e110e77477a8dce21e701ad1 /arch | |
| parent | f7402dc44d617be807e7184c6c624611b2d35b4e (diff) | |
| parent | 09bbe1043a65903c93f6b6df123e36e3584bfac7 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc64/kernel/sunos_ioctl32.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/sparc64/kernel/sunos_ioctl32.c b/arch/sparc64/kernel/sunos_ioctl32.c index 87c1aeb02220..7654b8a7f03a 100644 --- a/arch/sparc64/kernel/sunos_ioctl32.c +++ b/arch/sparc64/kernel/sunos_ioctl32.c | |||
| @@ -152,11 +152,12 @@ asmlinkage int sunos_ioctl (int fd, u32 cmd, u32 arg) | |||
| 152 | ret = compat_sys_ioctl(fd, SIOCGIFCONF, arg); | 152 | ret = compat_sys_ioctl(fd, SIOCGIFCONF, arg); |
| 153 | goto out; | 153 | goto out; |
| 154 | 154 | ||
| 155 | case _IOW('i', 21, struct ifreq): /* SIOCSIFMTU */ | 155 | case _IOW('i', 21, struct ifreq32): |
| 156 | ret = sys_ioctl(fd, SIOCSIFMTU, arg); | 156 | ret = compat_sys_ioctl(fd, SIOCSIFMTU, arg); |
| 157 | goto out; | 157 | goto out; |
| 158 | case _IOWR('i', 22, struct ifreq): /* SIOCGIFMTU */ | 158 | |
| 159 | ret = sys_ioctl(fd, SIOCGIFMTU, arg); | 159 | case _IOWR('i', 22, struct ifreq32): |
| 160 | ret = compat_sys_ioctl(fd, SIOCGIFMTU, arg); | ||
| 160 | goto out; | 161 | goto out; |
| 161 | 162 | ||
| 162 | case _IOWR('i', 23, struct ifreq32): | 163 | case _IOWR('i', 23, struct ifreq32): |