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

2 files changed, 7 insertions, 8 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)
                 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 ifreq32):
+                ret = compat_sys_ioctl(fd, SIOCSIFMTU, arg);
                 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):
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index cf0f64ea2bc0..9b12fe731612 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -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.
  */
-#ifdef SUPPORT_SYSRQ
 static inline int
 uart_handle_sysrq_char(struct uart_port *port, unsigned int ch,
                        struct pt_regs *regs)
 {
+#ifdef SUPPORT_SYSRQ
         if (port->sysrq) {
                 if (ch && time_before(jiffies, port->sysrq)) {
                         handle_sysrq(ch, regs, NULL);
@@ -398,11 +398,9 @@ uart_handle_sysrq_char(struct uart_port *port, unsigned int ch,
                 }
                 port->sysrq = 0;
         }
+#endif
         return 0;
 }
-#else
-#define uart_handle_sysrq_char(port,ch,regs)    (0)
-#endif
 
 /*
  * We do the SysRQ and SAK checking like this...