diff options
| author | James Morris <jmorris@namei.org> | 2008-12-04 01:16:36 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-12-04 01:16:36 -0500 |
| commit | ec98ce480ada787f2cfbd696980ff3564415505b (patch) | |
| tree | 1a4d644b38f9f1e4b4e086fde0b195df4a92cf84 /arch/sparc/include/asm/unistd_32.h | |
| parent | 3496f92beb9aa99ef21fccc154a36c7698e9c538 (diff) | |
| parent | feaf3848a813a106f163013af6fcf6c4bfec92d9 (diff) | |
Merge branch 'master' into next
Conflicts:
fs/nfsd/nfs4recover.c
Manually fixed above to use new creds API functions, e.g.
nfs4_save_creds().
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'arch/sparc/include/asm/unistd_32.h')
| -rw-r--r-- | arch/sparc/include/asm/unistd_32.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/unistd_32.h b/arch/sparc/include/asm/unistd_32.h index 648643a9f13..0d13d2a4c76 100644 --- a/arch/sparc/include/asm/unistd_32.h +++ b/arch/sparc/include/asm/unistd_32.h | |||
| @@ -338,8 +338,9 @@ | |||
| 338 | #define __NR_dup3 320 | 338 | #define __NR_dup3 320 |
| 339 | #define __NR_pipe2 321 | 339 | #define __NR_pipe2 321 |
| 340 | #define __NR_inotify_init1 322 | 340 | #define __NR_inotify_init1 322 |
| 341 | #define __NR_accept4 323 | ||
| 341 | 342 | ||
| 342 | #define NR_SYSCALLS 323 | 343 | #define NR_SYSCALLS 324 |
| 343 | 344 | ||
| 344 | /* Sparc 32-bit only has the "setresuid32", "getresuid32" variants, | 345 | /* Sparc 32-bit only has the "setresuid32", "getresuid32" variants, |
| 345 | * it never had the plain ones and there is no value to adding those | 346 | * it never had the plain ones and there is no value to adding those |