From: David Woodhouse <dwmw2@shinybook.infradead.org>
Date: Sun, 30 Apr 2006 19:34:39 +0000 (+0100)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.18-rc1~1103^2~26
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b07019f29328ebb1b48d3faf952b84f07ec9b973;p=linux-2.6

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---

b07019f29328ebb1b48d3faf952b84f07ec9b973
diff --cc include/asm-powerpc/unistd.h
index bd3c6b6cc5,908acb44cb..9e2c9e1c12
--- a/include/asm-powerpc/unistd.h
+++ b/include/asm-powerpc/unistd.h
@@@ -304,13 -304,30 +304,30 @@@
  #define __NR_splice		283
  #define __NR_tee		284
  #define __NR_vmsplice		285
+ #define __NR_openat		286
+ #define __NR_mkdirat		287
+ #define __NR_mknodat		288
+ #define __NR_fchownat		289
+ #define __NR_futimesat		290
+ #ifdef __powerpc64__
+ #define __NR_newfstatat		291
+ #else
+ #define __NR_fstatat64		291
+ #endif
+ #define __NR_unlinkat		292
+ #define __NR_renameat		293
+ #define __NR_linkat		294
+ #define __NR_symlinkat		295
+ #define __NR_readlinkat		296
+ #define __NR_fchmodat		297
+ #define __NR_faccessat		298
  
 +#ifdef __KERNEL__
 +
- #define __NR_syscalls		286
+ #define __NR_syscalls		299
  
 -#ifdef __KERNEL__
  #define __NR__exit __NR_exit
  #define NR_syscalls	__NR_syscalls
 -#endif
  
  #ifndef __ASSEMBLY__