Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (946e91f3) · Commits · e / devices / android_kernel_xiaomi_markw

arch/sparc64/kernel/sunos_ioctl32.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -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):

+2 −4

Original line number	Diff line number	Diff line
		@@ -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...