Commit 946e91f36e90eea46758dd725b1c3b239f270f68
Exists in
master
and in
4 other branches
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Showing 2 changed files Side-by-side Diff
arch/sparc64/kernel/sunos_ioctl32.c
| ... | ... | @@ -152,11 +152,12 @@ |
| 152 | 152 | ret = compat_sys_ioctl(fd, SIOCGIFCONF, arg); |
| 153 | 153 | goto out; |
| 154 | 154 | |
| 155 | - case _IOW('i', 21, struct ifreq): /* SIOCSIFMTU */ | |
| 156 | - ret = sys_ioctl(fd, SIOCSIFMTU, arg); | |
| 155 | + case _IOW('i', 21, struct ifreq32): | |
| 156 | + ret = compat_sys_ioctl(fd, SIOCSIFMTU, arg); | |
| 157 | 157 | goto out; |
| 158 | - case _IOWR('i', 22, struct ifreq): /* SIOCGIFMTU */ | |
| 159 | - ret = sys_ioctl(fd, SIOCGIFMTU, arg); | |
| 158 | + | |
| 159 | + case _IOWR('i', 22, struct ifreq32): | |
| 160 | + ret = compat_sys_ioctl(fd, SIOCGIFMTU, arg); | |
| 160 | 161 | goto out; |
| 161 | 162 | |
| 162 | 163 | case _IOWR('i', 23, struct ifreq32): |
include/linux/serial_core.h
| ... | ... | @@ -385,11 +385,11 @@ |
| 385 | 385 | /* |
| 386 | 386 | * The following are helper functions for the low level drivers. |
| 387 | 387 | */ |
| 388 | -#ifdef SUPPORT_SYSRQ | |
| 389 | 388 | static inline int |
| 390 | 389 | uart_handle_sysrq_char(struct uart_port *port, unsigned int ch, |
| 391 | 390 | struct pt_regs *regs) |
| 392 | 391 | { |
| 392 | +#ifdef SUPPORT_SYSRQ | |
| 393 | 393 | if (port->sysrq) { |
| 394 | 394 | if (ch && time_before(jiffies, port->sysrq)) { |
| 395 | 395 | handle_sysrq(ch, regs, NULL); |
| 396 | 396 | |
| ... | ... | @@ -398,11 +398,9 @@ |
| 398 | 398 | } |
| 399 | 399 | port->sysrq = 0; |
| 400 | 400 | } |
| 401 | +#endif | |
| 401 | 402 | return 0; |
| 402 | 403 | } |
| 403 | -#else | |
| 404 | -#define uart_handle_sysrq_char(port,ch,regs) (0) | |
| 405 | -#endif | |
| 406 | 404 | |
| 407 | 405 | /* |
| 408 | 406 | * We do the SysRQ and SAK checking like this... |