Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Ignore vmlinux.lds generated files
  [MIPS] kgdb: Do not call fixup_exception
  [MIPS] RB532: Do not define registers that are already defined
  [MIPS] IP27: Export symbol pcibus_to_node to modules.
  [MIPS] kgdb: s/(void *)0)/NULL/
  [MIPS] kgdb: smp_call_function's 3rd argument is a pointer.
  [MIPS] TXx9: Fix mips_hpt_frequency initialization
  [MIPS] emma2rh: Fix build error by header file inclusion weeding.
  [MIPS] Jazz: Fix build error by header file inclusion weeding.
  [MIPS] Wire up new syscalls.
  [MIPS] Convert printk statements during kernel setup to use severity levels

1 files changed, 24 insertions, 6 deletions

diff --git a/include/asm-mips/unistd.h b/include/asm-mips/unistd.h
index 4964c82f85f9..a73e1531e151 100644
--- a/include/asm-mips/unistd.h
+++ b/include/asm-mips/unistd.h
@@ -344,16 +344,22 @@
 #define __NR_timerfd_create             (__NR_Linux + 321)
 #define __NR_timerfd_gettime            (__NR_Linux + 322)
 #define __NR_timerfd_settime            (__NR_Linux + 323)
+#define __NR_signalfd4                  (__NR_Linux + 324)
+#define __NR_eventfd2                   (__NR_Linux + 325)
+#define __NR_epoll_create1              (__NR_Linux + 326)
+#define __NR_dup3                       (__NR_Linux + 327)
+#define __NR_pipe2                      (__NR_Linux + 328)
+#define __NR_inotify_init1              (__NR_Linux + 329)
 
 /*
  * Offset of the last Linux o32 flavoured syscall
  */
-#define __NR_Linux_syscalls             323
+#define __NR_Linux_syscalls             329
 
 #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
 
 #define __NR_O32_Linux                  4000
-#define __NR_O32_Linux_syscalls         323
+#define __NR_O32_Linux_syscalls         329
 
 #if _MIPS_SIM == _MIPS_SIM_ABI64
 
@@ -644,16 +650,22 @@
 #define __NR_timerfd_create             (__NR_Linux + 280)
 #define __NR_timerfd_gettime            (__NR_Linux + 281)
 #define __NR_timerfd_settime            (__NR_Linux + 282)
+#define __NR_signalfd4                  (__NR_Linux + 283)
+#define __NR_eventfd2                   (__NR_Linux + 284)
+#define __NR_epoll_create1              (__NR_Linux + 285)
+#define __NR_dup3                       (__NR_Linux + 286)
+#define __NR_pipe2                      (__NR_Linux + 287)
+#define __NR_inotify_init1              (__NR_Linux + 288)
 
 /*
  * Offset of the last Linux 64-bit flavoured syscall
  */
-#define __NR_Linux_syscalls             282
+#define __NR_Linux_syscalls             288
 
 #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */
 
 #define __NR_64_Linux                   5000
-#define __NR_64_Linux_syscalls          282
+#define __NR_64_Linux_syscalls          288
 
 #if _MIPS_SIM == _MIPS_SIM_NABI32
 
@@ -948,16 +960,22 @@
 #define __NR_timerfd_create             (__NR_Linux + 284)
 #define __NR_timerfd_gettime            (__NR_Linux + 285)
 #define __NR_timerfd_settime            (__NR_Linux + 286)
+#define __NR_signalfd4                  (__NR_Linux + 287)
+#define __NR_eventfd2                   (__NR_Linux + 288)
+#define __NR_epoll_create1              (__NR_Linux + 289)
+#define __NR_dup3                       (__NR_Linux + 290)
+#define __NR_pipe2                      (__NR_Linux + 291)
+#define __NR_inotify_init1              (__NR_Linux + 292)
 
 /*
  * Offset of the last N32 flavoured syscall
  */
-#define __NR_Linux_syscalls             286
+#define __NR_Linux_syscalls             292
 
 #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */
 
 #define __NR_N32_Linux                  6000
-#define __NR_N32_Linux_syscalls         286
+#define __NR_N32_Linux_syscalls         292
 
 #ifdef __KERNEL__