diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/powerpc/include/asm/systbl.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/powerpc/include/asm/systbl.h')
| -rw-r--r-- | arch/powerpc/include/asm/systbl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/systbl.h b/arch/powerpc/include/asm/systbl.h index c7d671a7d9a1..a5ee345b6a5c 100644 --- a/arch/powerpc/include/asm/systbl.h +++ b/arch/powerpc/include/asm/systbl.h | |||
| @@ -125,7 +125,7 @@ SYSCALL_SPU(fsync) | |||
| 125 | SYS32ONLY(sigreturn) | 125 | SYS32ONLY(sigreturn) |
| 126 | PPC_SYS(clone) | 126 | PPC_SYS(clone) |
| 127 | COMPAT_SYS_SPU(setdomainname) | 127 | COMPAT_SYS_SPU(setdomainname) |
| 128 | PPC_SYS_SPU(newuname) | 128 | SYSCALL_SPU(newuname) |
| 129 | SYSCALL(ni_syscall) | 129 | SYSCALL(ni_syscall) |
| 130 | COMPAT_SYS_SPU(adjtimex) | 130 | COMPAT_SYS_SPU(adjtimex) |
| 131 | SYSCALL_SPU(mprotect) | 131 | SYSCALL_SPU(mprotect) |
| @@ -145,7 +145,7 @@ SYSCALL_SPU(setfsuid) | |||
| 145 | SYSCALL_SPU(setfsgid) | 145 | SYSCALL_SPU(setfsgid) |
| 146 | SYSCALL_SPU(llseek) | 146 | SYSCALL_SPU(llseek) |
| 147 | COMPAT_SYS_SPU(getdents) | 147 | COMPAT_SYS_SPU(getdents) |
| 148 | SYSX_SPU(sys_select,ppc32_select,ppc_select) | 148 | SYSX_SPU(sys_select,ppc32_select,sys_select) |
| 149 | SYSCALL_SPU(flock) | 149 | SYSCALL_SPU(flock) |
| 150 | SYSCALL_SPU(msync) | 150 | SYSCALL_SPU(msync) |
| 151 | COMPAT_SYS_SPU(readv) | 151 | COMPAT_SYS_SPU(readv) |