diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-20 17:53:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-20 17:53:50 -0700 |
| commit | 6113f39dd15e4beb5ce66a8e0d9062477c5e81e3 (patch) | |
| tree | b9e491ab539a934a579be17cf72b0f7695f757e4 /include | |
| parent | db552b3331766e16c35550a4b83c3a42671ba73e (diff) | |
| parent | 339dc50e59f4ea697e2b8cd6296328a8015a6c21 (diff) | |
| download | linux-3.10-6113f39dd15e4beb5ce66a8e0d9062477c5e81e3.tar.gz linux-3.10-6113f39dd15e4beb5ce66a8e0d9062477c5e81e3.tar.bz2 linux-3.10-6113f39dd15e4beb5ce66a8e0d9062477c5e81e3.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
asm-generic: support clock_adjtime() in <asm-generic/unistd.h>
arch/tile: fix futex sanitization definition/prototype mismatch
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/unistd.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-generic/unistd.h b/include/asm-generic/unistd.h index 57af0338d27..d94f447c667 100644 --- a/include/asm-generic/unistd.h +++ b/include/asm-generic/unistd.h @@ -650,9 +650,11 @@ __SYSCALL(__NR_fanotify_mark, sys_fanotify_mark) __SYSCALL(__NR_name_to_handle_at, sys_name_to_handle_at) #define __NR_open_by_handle_at 265 __SYSCALL(__NR_open_by_handle_at, sys_open_by_handle_at) +#define __NR_clock_adjtime 266 +__SYSCALL(__NR_clock_adjtime, sys_clock_adjtime) #undef __NR_syscalls -#define __NR_syscalls 266 +#define __NR_syscalls 267 /* * All syscalls below here should go away really, |