hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

* 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh64: wire up sys_accept4.
  sh: unwire sys_recvmmsg.
  sh: ms7724: Correct sh-eth EEPROM polling timeout.
This commit is contained in:
Linus Torvalds 2010-01-21 07:16:27 -08:00
parent def2052922 79f211b8e1
commit 970114a1da
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sh/boards/mach-se/7724/setup.c
View File

@ -533,7 +533,7 @@ static int __init sh_eth_is_eeprom_ready(void)
while (t--) { while (t--) {
if (!ctrl_inw(EEPROM_STAT)) if (!ctrl_inw(EEPROM_STAT))
return 1; return 1;
cpu_relax(); udelay(1);
} }
printk(KERN_ERR "ms7724se can not access to eeprom\n"); printk(KERN_ERR "ms7724se can not access to eeprom\n");

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

@ -345,12 +345,13 @@
#define __NR_pwritev 334 #define __NR_pwritev 334
#define __NR_rt_tgsigqueueinfo 335 #define __NR_rt_tgsigqueueinfo 335
#define __NR_perf_event_open 336 #define __NR_perf_event_open 336
#define __NR_recvmmsg 337
#define NR_syscalls 338 #define NR_syscalls 337
#ifdef __KERNEL__ #ifdef __KERNEL__
#define __IGNORE_recvmmsg
#define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_IPC_PARSE_VERSION
#define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_OLD_READDIR
#define __ARCH_WANT_OLD_STAT #define __ARCH_WANT_OLD_STAT

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

@ -386,10 +386,11 @@
#define __NR_rt_tgsigqueueinfo 363 #define __NR_rt_tgsigqueueinfo 363
#define __NR_perf_event_open 364 #define __NR_perf_event_open 364
#define __NR_recvmmsg 365 #define __NR_recvmmsg 365
#define __NR_accept4 366
#ifdef __KERNEL__ #ifdef __KERNEL__
#define NR_syscalls 366 #define NR_syscalls 367
#define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_IPC_PARSE_VERSION
#define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_OLD_READDIR

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

@ -353,4 +353,3 @@ ENTRY(sys_call_table)
.long sys_pwritev .long sys_pwritev
.long sys_rt_tgsigqueueinfo /* 335 */ .long sys_rt_tgsigqueueinfo /* 335 */
.long sys_perf_event_open .long sys_perf_event_open
.long sys_recvmmsg

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

@ -392,3 +392,4 @@ sys_call_table:
.long sys_rt_tgsigqueueinfo .long sys_rt_tgsigqueueinfo
.long sys_perf_event_open .long sys_perf_event_open
.long sys_recvmmsg /* 365 */ .long sys_recvmmsg /* 365 */
.long sys_accept4