diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-06-04 12:28:05 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-06-04 12:28:05 +0200 |
commit | 3ce2a0bc9dfb6423491afe0afc9f099e24b8cba4 (patch) | |
tree | 58fbef582846fef0e777b1a552aca12e21a071b1 /arch/ia64/include/asm/unistd.h | |
parent | aef29bf20bd79c73992ab23d5067e9f0448b466e (diff) | |
parent | aa4a221875873d2a1f9656cb7fd7e545e952b4fa (diff) | |
download | linux-next-3ce2a0bc9dfb6423491afe0afc9f099e24b8cba4.tar.gz |
Merge branch 'perf/urgent' into perf/core
Conflicts:
tools/perf/util/python.c
Merge reason: resolve the conflict with perf/urgent.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/ia64/include/asm/unistd.h')
-rw-r--r-- | arch/ia64/include/asm/unistd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h index 1cf0f496f744..7c928da35b17 100644 --- a/arch/ia64/include/asm/unistd.h +++ b/arch/ia64/include/asm/unistd.h @@ -320,11 +320,12 @@ #define __NR_clock_adjtime 1328 #define __NR_syncfs 1329 #define __NR_setns 1330 +#define __NR_sendmmsg 1331 #ifdef __KERNEL__ -#define NR_syscalls 307 /* length of syscall table */ +#define NR_syscalls 308 /* length of syscall table */ /* * The following defines stop scripts/checksyscalls.sh from complaining about |