lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* '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.
This commit is contained in:
Linus Torvalds
2010-12-14 17:37:08 -08:00
parent ec5d043f28 21b6e4c710
commit dbd9fd63bd
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/sh/Kconfig
View File

@@ -22,7 +22,8 @@ config SUPERH
select HAVE_SPARSE_IRQ select HAVE_SPARSE_IRQ
select RTC_LIB select RTC_LIB
select GENERIC_ATOMIC64 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 help
The SuperH is a RISC processor targeted for use in embedded systems The SuperH is a RISC processor targeted for use in embedded systems
and consumer electronics; it was also used in the Sega Dreamcast and consumer electronics; it was also used in the Sega Dreamcast

3
arch/sh/include/asm/unistd_32.h
View File

@@ -368,8 +368,9 @@
#define __NR_sendmsg 355 #define __NR_sendmsg 355
#define __NR_recvmsg 356 #define __NR_recvmsg 356
#define __NR_recvmmsg 357 #define __NR_recvmmsg 357
#define __NR_accept4 358
#define NR_syscalls 358 #define NR_syscalls 359
#ifdef __KERNEL__ #ifdef __KERNEL__

1
arch/sh/kernel/syscalls_32.S
View File

@@ -375,3 +375,4 @@ ENTRY(sys_call_table)
.long sys_sendmsg /* 355 */ .long sys_sendmsg /* 355 */
.long sys_recvmsg .long sys_recvmsg
.long sys_recvmmsg .long sys_recvmmsg
.long sys_accept4