diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-09-08 17:27:13 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-09-08 17:27:13 -0400 |
| commit | 344a076110f4ecb16ea6d286b63be696604982ed (patch) | |
| tree | def6e229efdb6ee91b631b6695bf7f9ace8e2719 /arch/sparc64/kernel/sunos_ioctl32.c | |
| parent | 9b17e7e74e767d8a494a74c3c459aeecd1e08c5f (diff) | |
| parent | 1b11d78cf87a7014f96e5b7fa2e1233cc8081a00 (diff) | |
[IA64] Manual merge fix for 3 files
arch/ia64/Kconfig
arch/ia64/kernel/acpi.c
include/asm-ia64/irq.h
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/sparc64/kernel/sunos_ioctl32.c')
| -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): |