Commit dbd9fd63 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 

* 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: wire up accept4 syscall (non-multiplexed path)
  sh: Enable deprecated IRQ chip APIs for MFD and GPIOLIB drivers.
parents ec5d043f 21b6e4c7

arch/sh/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ config SUPERH 
	select HAVE_SPARSE_IRQ

	select RTC_LIB

	select GENERIC_ATOMIC64

	select GENERIC_HARDIRQS_NO_DEPRECATED

	# Support the deprecated APIs until MFD and GPIOLIB catch up.

	select GENERIC_HARDIRQS_NO_DEPRECATED if !MFD_SUPPORT && !GPIOLIB

	help

	  The SuperH is a RISC processor targeted for use in embedded systems

	  and consumer electronics; it was also used in the Sega Dreamcast

arch/sh/include/asm/unistd_32.h

+2 −1
Original line number Diff line number Diff line
@@ -368,8 +368,9 @@ 
#define __NR_sendmsg		355

#define __NR_recvmsg		356

#define __NR_recvmmsg		357

#define __NR_accept4		358



#define NR_syscalls 358

#define NR_syscalls 359



#ifdef __KERNEL__

arch/sh/kernel/syscalls_32.S

+1 −0
Original line number Diff line number Diff line
@@ -375,3 +375,4 @@ ENTRY(sys_call_table) 
	.long sys_sendmsg		/* 355 */

	.long sys_recvmsg

	.long sys_recvmmsg

	.long sys_accept4