Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 46a56c5a02430f80ef73357aa1295875c1cef2a7

Authored by Haavard Skinnemoen
Committed by Linus Torvalds
1 parent 8cb2a7c1e9
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

Fix timerfd breakage on avr32 

Hmm. Someone removed the timerfd() syscall...

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

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

arch/avr32/kernel/syscall_table.S
Diff comments   View file @ 46a56c5
... ... @@ -293,7 +293,7 @@
293 293 .long sys_shmctl
294 294 .long sys_utimensat
295 295 .long sys_signalfd
296   - .long sys_timerfd /* 280 */
  296 + .long sys_ni_syscall /* 280, was sys_timerfd */
297 297 .long sys_eventfd
298 298 .long sys_ni_syscall /* r8 is saturated at nr_syscalls */
include/asm-avr32/unistd.h
Diff comments   View file @ 46a56c5
... ... @@ -297,7 +297,7 @@
297 297  
298 298 #define __NR_utimensat 278
299 299 #define __NR_signalfd 279
300   -#define __NR_timerfd 280
  300 +/* 280 was __NR_timerfd */
301 301 #define __NR_eventfd 281
302 302  
303 303 #ifdef __KERNEL__