summaryrefslogtreecommitdiff
path: root/arch/powerpc/include/asm/unistd.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-04-08 08:35:30 (GMT)
committerIngo Molnar <mingo@elte.hu>2009-04-08 08:35:30 (GMT)
commit5ea472a77f8e4811ceee3f44a9deda6ad6e8b789 (patch)
treea9ec5019e2b666a19874fc344ffb0dd5da6bce94 /arch/powerpc/include/asm/unistd.h
parent6c009ecef8cca28c7c09eb16d0802e37915a76e1 (diff)
parent577c9c456f0e1371cbade38eaf91ae8e8a308555 (diff)
downloadlinux-fsl-qoriq-5ea472a77f8e4811ceee3f44a9deda6ad6e8b789.tar.xz
Merge commit 'v2.6.30-rc1' into perfcounters/core
Conflicts: arch/powerpc/include/asm/systbl.h arch/powerpc/include/asm/unistd.h include/linux/init_task.h Merge reason: the conflicts are non-trivial: PowerPC placement of sys_perf_counter_open has to be mixed with the new preadv/pwrite syscalls. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/powerpc/include/asm/unistd.h')
-rw-r--r--arch/powerpc/include/asm/unistd.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/unistd.h b/arch/powerpc/include/asm/unistd.h
index 7cef5af..4badac2 100644
--- a/arch/powerpc/include/asm/unistd.h
+++ b/arch/powerpc/include/asm/unistd.h
@@ -342,10 +342,12 @@
#define __NR_pipe2 317
#define __NR_inotify_init1 318
#define __NR_perf_counter_open 319
+#define __NR_preadv 320
+#define __NR_pwritev 321
#ifdef __KERNEL__
-#define __NR_syscalls 320
+#define __NR_syscalls 322
#define __NR__exit __NR_exit
#define NR_syscalls __NR_syscalls