Commit 970114a1 authored by Linus Torvalds's avatar Linus Torvalds

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.
parents def20529 79f211b8
...@@ -533,7 +533,7 @@ static int __init sh_eth_is_eeprom_ready(void) ...@@ -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");
......
...@@ -345,12 +345,13 @@ ...@@ -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
......
...@@ -386,10 +386,11 @@ ...@@ -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
......
...@@ -353,4 +353,3 @@ ENTRY(sys_call_table) ...@@ -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
...@@ -392,3 +392,4 @@ sys_call_table: ...@@ -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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment