tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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.

Linus Torvalds 970114a1 def20529

+7 -5
+1 -1
arch/sh/boards/mach-se/7724/setup.c
··· 533 533 while (t--) { 534 534 if (!ctrl_inw(EEPROM_STAT)) 535 535 return 1; 536 - cpu_relax(); 536 + udelay(1); 537 537 } 538 538 539 539 printk(KERN_ERR "ms7724se can not access to eeprom\n");
+3 -2
arch/sh/include/asm/unistd_32.h
··· 345 345 #define __NR_pwritev 334 346 346 #define __NR_rt_tgsigqueueinfo 335 347 347 #define __NR_perf_event_open 336 348 - #define __NR_recvmmsg 337 349 348 350 - #define NR_syscalls 338 349 + #define NR_syscalls 337 351 350 352 351 #ifdef __KERNEL__ 352 + 353 + #define __IGNORE_recvmmsg 353 354 354 355 #define __ARCH_WANT_IPC_PARSE_VERSION 355 356 #define __ARCH_WANT_OLD_READDIR
+2 -1
arch/sh/include/asm/unistd_64.h
··· 386 386 #define __NR_rt_tgsigqueueinfo 363 387 387 #define __NR_perf_event_open 364 388 388 #define __NR_recvmmsg 365 389 + #define __NR_accept4 366 389 390 390 391 #ifdef __KERNEL__ 391 392 392 - #define NR_syscalls 366 393 + #define NR_syscalls 367 393 394 394 395 #define __ARCH_WANT_IPC_PARSE_VERSION 395 396 #define __ARCH_WANT_OLD_READDIR
-1
arch/sh/kernel/syscalls_32.S
··· 353 353 .long sys_pwritev 354 354 .long sys_rt_tgsigqueueinfo /* 335 */ 355 355 .long sys_perf_event_open 356 - .long sys_recvmmsg
+1
arch/sh/kernel/syscalls_64.S
··· 392 392 .long sys_rt_tgsigqueueinfo 393 393 .long sys_perf_event_open 394 394 .long sys_recvmmsg /* 365 */ 395 + .long sys_accept4