git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
sparc64
/
kernel
/
sunos_ioctl32.c
diff --git
a/arch/sparc64/kernel/sunos_ioctl32.c
b/arch/sparc64/kernel/sunos_ioctl32.c
index
87c1aeb
..
3f619ea
100644
(file)
--- a/
arch/sparc64/kernel/sunos_ioctl32.c
+++ b/
arch/sparc64/kernel/sunos_ioctl32.c
@@
-24,7
+24,6
@@
#include <linux/smp_lock.h>
#include <linux/syscalls.h>
#include <linux/compat.h>
#include <linux/smp_lock.h>
#include <linux/syscalls.h>
#include <linux/compat.h>
-#include <asm/kbio.h>
#define SUNOS_NR_OPEN 256
#define SUNOS_NR_OPEN 256
@@
-152,11
+151,12
@@
asmlinkage int sunos_ioctl (int fd, u32 cmd, u32 arg)
ret = compat_sys_ioctl(fd, SIOCGIFCONF, arg);
goto out;
ret = compat_sys_ioctl(fd, SIOCGIFCONF, arg);
goto out;
- case _IOW('i', 21, struct ifreq
): /* SIOCSIFMTU */
- ret = sys_ioctl(fd, SIOCSIFMTU, arg);
+ case _IOW('i', 21, struct ifreq
32):
+ ret =
compat_
sys_ioctl(fd, SIOCSIFMTU, arg);
goto out;
goto out;
- case _IOWR('i', 22, struct ifreq): /* SIOCGIFMTU */
- ret = sys_ioctl(fd, SIOCGIFMTU, arg);
+
+ case _IOWR('i', 22, struct ifreq32):
+ ret = compat_sys_ioctl(fd, SIOCGIFMTU, arg);
goto out;
case _IOWR('i', 23, struct ifreq32):
goto out;
case _IOWR('i', 23, struct ifreq32):