Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9692bd9c140618e3f6a2848900aee96c9cd8a65c

Authored by Andrew Morton
Committed by Linus Torvalds
1 parent 46a56c5a02
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

timerfd: fix remaining architectures 

Cc: David Howells <dhowells@redhat.com>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Kazumoto Kojima <kkojima@rr.iij4u.or.jp>
Cc: Richard Curnow <rc@rc0.org.uk>
Cc: Davide Libenzi <davidel@xmailserver.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 8 changed files with 8 additions and 8 deletions Side-by-side Diff

arch/frv/kernel/entry.S
Diff comments   View file @ 9692bd9
... ... @@ -1494,7 +1494,7 @@
1494 1494 .long sys_epoll_pwait
1495 1495 .long sys_utimensat /* 320 */
1496 1496 .long sys_signalfd
1497   - .long sys_timerfd
  1497 + .long sys_ni_syscall
1498 1498 .long sys_eventfd
1499 1499 .long sys_fallocate
1500 1500  
arch/m32r/kernel/syscall_table.S
Diff comments   View file @ 9692bd9
... ... @@ -321,7 +321,7 @@
321 321 .long sys_epoll_pwait
322 322 .long sys_utimensat /* 320 */
323 323 .long sys_signalfd
324   - .long sys_timerfd
  324 + .long sys_ni_syscall
325 325 .long sys_eventfd
326 326 .long sys_fallocate
arch/sh/kernel/syscalls_32.S
Diff comments   View file @ 9692bd9
... ... @@ -338,7 +338,7 @@
338 338 .long sys_epoll_pwait
339 339 .long sys_utimensat /* 320 */
340 340 .long sys_signalfd
341   - .long sys_timerfd
  341 + .long sys_ni_syscall
342 342 .long sys_eventfd
343 343 .long sys_fallocate
arch/sh/kernel/syscalls_64.S
Diff comments   View file @ 9692bd9
... ... @@ -376,7 +376,7 @@
376 376 .long sys_epoll_pwait
377 377 .long sys_utimensat
378 378 .long sys_signalfd
379   - .long sys_timerfd /* 350 */
  379 + .long sys_ni_syscall /* 350 */
380 380 .long sys_eventfd
381 381 .long sys_fallocate
include/asm-frv/unistd.h
Diff comments   View file @ 9692bd9
... ... @@ -328,7 +328,7 @@
328 328 #define __NR_epoll_pwait 319
329 329 #define __NR_utimensat 320
330 330 #define __NR_signalfd 321
331   -#define __NR_timerfd 322
  331 +/* #define __NR_timerfd 322 removed */
332 332 #define __NR_eventfd 323
333 333 #define __NR_fallocate 324
334 334  
include/asm-m32r/unistd.h
Diff comments   View file @ 9692bd9
... ... @@ -327,7 +327,7 @@
327 327 #define __NR_epoll_pwait 319
328 328 #define __NR_utimensat 320
329 329 #define __NR_signalfd 321
330   -#define __NR_timerfd 322
  330 +/* #define __NR_timerfd 322 removed */
331 331 #define __NR_eventfd 323
332 332 #define __NR_fallocate 324
333 333  
include/asm-sh/unistd_32.h
Diff comments   View file @ 9692bd9
... ... @@ -330,7 +330,7 @@
330 330 #define __NR_epoll_pwait 319
331 331 #define __NR_utimensat 320
332 332 #define __NR_signalfd 321
333   -#define __NR_timerfd 322
  333 +/* #define __NR_timerfd 322 removed */
334 334 #define __NR_eventfd 323
335 335 #define __NR_fallocate 324
336 336  
include/asm-sh/unistd_64.h
Diff comments   View file @ 9692bd9
... ... @@ -370,7 +370,7 @@
370 370 #define __NR_epoll_pwait 347
371 371 #define __NR_utimensat 348
372 372 #define __NR_signalfd 349
373   -#define __NR_timerfd 350
  373 +/* #define __NR_timerfd 350 removed */
374 374 #define __NR_eventfd 351
375 375 #define __NR_fallocate 352
376 376