Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-13 16:50:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

Browse Source
This commit is contained in:
Linus Torvalds 2005-09-07 17:21:17 -07:00
commit 946e91f36e
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/sparc64/kernel/sunos_ioctl32.c
View File

@ -152,11 +152,12 @@ asmlinkage int sunos_ioctl (int fd, u32 cmd, u32 arg)
ret = compat_sys_ioctl(fd, SIOCGIFCONF, arg); ret = compat_sys_ioctl(fd, SIOCGIFCONF, arg);
goto out; goto out;
case _IOW('i', 21, struct ifreq): /* SIOCSIFMTU */ case _IOW('i', 21, struct ifreq32):
ret = sys_ioctl(fd, SIOCSIFMTU, arg); 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; goto out;
case _IOWR('i', 23, struct ifreq32): case _IOWR('i', 23, struct ifreq32):

6
include/linux/serial_core.h
View File

@ -385,11 +385,11 @@ int uart_resume_port(struct uart_driver *reg, struct uart_port *port);
/* /*
* The following are helper functions for the low level drivers. * The following are helper functions for the low level drivers.
*/ */
#ifdef SUPPORT_SYSRQ
static inline int static inline int
uart_handle_sysrq_char(struct uart_port *port, unsigned int ch, uart_handle_sysrq_char(struct uart_port *port, unsigned int ch,
struct pt_regs *regs) struct pt_regs *regs)
{ {
#ifdef SUPPORT_SYSRQ
if (port->sysrq) { if (port->sysrq) {
if (ch && time_before(jiffies, port->sysrq)) { if (ch && time_before(jiffies, port->sysrq)) {
handle_sysrq(ch, regs, NULL); handle_sysrq(ch, regs, NULL);
@ -398,11 +398,9 @@ uart_handle_sysrq_char(struct uart_port *port, unsigned int ch,
} }
port->sysrq = 0; port->sysrq = 0;
} }
#endif
return 0; return 0;
} }
#else
#define uart_handle_sysrq_char(port,ch,regs) (0)
#endif
/* /*
* We do the SysRQ and SAK checking like this... * We do the SysRQ and SAK checking like this...