aboutsummaryrefslogtreecommitdiff
path: root/arch/mips/include/asm/unistd.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-07-26 15:35:04 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-07-26 15:35:04 -0700
commit863da9557e5ad2874f3fc6f350b392e03f983ca4 (patch)
tree9dd7964242933d7b761f1aee045e3a417283155c /arch/mips/include/asm/unistd.h
parent5620ae29f1eabe655f44335231b580a78c8364ea (diff)
parent8faf2e6c201d95b780cd3b4674b7a55ede6dcbbb (diff)
downloadlinux-2.6.34-ux500-863da9557e5ad2874f3fc6f350b392e03f983ca4.tar.gz
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: MIPS: Set io_map_base for several PCI bridges lacking it MIPS: Alchemy: Define eth platform devices in the correct order MIPS: BCM63xx: Prevent second enet registration on BCM6338 MIPS: Quit using undefined behavior of ADDU in 64-bit atomic operations. MIPS: N32: Define getdents64. MIPS: MTX-1: Fix PCI on the MeshCube and related boards MIPS: Make init_vdso a subsys_initcall. MIPS: "Fix" useless 'init_vdso successfully' message. MIPS: PowerTV: Move register setup to before reading registers. SOUND: Au1000: Fix section mismatch VIDEO: Au1100fb: Fix section mismatch VIDEO: PMAGB-B: Fix section mismatch VIDEO: PMAG-BA: Fix section mismatch NET: declance: Fix section mismatches VIDEO. gbefb: Fix section mismatches.
Diffstat (limited to 'arch/mips/include/asm/unistd.h')
-rw-r--r--arch/mips/include/asm/unistd.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/include/asm/unistd.h b/arch/mips/include/asm/unistd.h
index 1b5a6648eb8..baa318a59c9 100644
--- a/arch/mips/include/asm/unistd.h
+++ b/arch/mips/include/asm/unistd.h
@@ -984,16 +984,17 @@
#define __NR_perf_event_open (__NR_Linux + 296)
#define __NR_accept4 (__NR_Linux + 297)
#define __NR_recvmmsg (__NR_Linux + 298)
+#define __NR_getdents64 (__NR_Linux + 299)
/*
* Offset of the last N32 flavoured syscall
*/
-#define __NR_Linux_syscalls 298
+#define __NR_Linux_syscalls 299
#endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */
#define __NR_N32_Linux 6000
-#define __NR_N32_Linux_syscalls 298
+#define __NR_N32_Linux_syscalls 299
#ifdef __KERNEL__