diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-18 15:05:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-18 15:05:01 -0400 |
| commit | 04cde035fa47b4a7465a15db8d6eaebcc15a68af (patch) | |
| tree | ea70ab0cb99a8337f1822ec2f7e2ed5a7918bd8d /arch/powerpc/include/asm/systbl.h | |
| parent | 1de481ded98d1d48e2a4102a5aa549e3c4d18ee3 (diff) | |
| parent | 50d0b17645a26d2877c9d5538114498c3f82adac (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
powerpc: Use generic compat_sys_old_readdir
powerpc/kexec: Fix up KEXEC_CONTROL_CODE_SIZE missed during conversion
powerpc: Remove dead module_find_bug code
powerpc: Add CMO enabled flag and paging space data to lparcfg
powerpc: Fix CMM page loaning on 64k page kernel with 4k hardware pages
powerpc: Make CMO paging space pool ID and page size available
powerpc: Fix lockdep IRQ tracing bug
powerpc: Fix TLB invalidation on boot on 32-bit
powerpc: Fix loss of vdso on fork on 32-bit
Diffstat (limited to 'arch/powerpc/include/asm/systbl.h')
| -rw-r--r-- | arch/powerpc/include/asm/systbl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/systbl.h b/arch/powerpc/include/asm/systbl.h index e084272ed1c2..f6cc7a43b4fa 100644 --- a/arch/powerpc/include/asm/systbl.h +++ b/arch/powerpc/include/asm/systbl.h | |||
| @@ -92,7 +92,7 @@ COMPAT_SYS_SPU(readlink) | |||
| 92 | SYSCALL(uselib) | 92 | SYSCALL(uselib) |
| 93 | SYSCALL(swapon) | 93 | SYSCALL(swapon) |
| 94 | SYSCALL(reboot) | 94 | SYSCALL(reboot) |
| 95 | SYSX(sys_ni_syscall,old32_readdir,old_readdir) | 95 | SYSX(sys_ni_syscall,compat_sys_old_readdir,old_readdir) |
| 96 | SYSCALL_SPU(mmap) | 96 | SYSCALL_SPU(mmap) |
| 97 | SYSCALL_SPU(munmap) | 97 | SYSCALL_SPU(munmap) |
| 98 | SYSCALL_SPU(truncate) | 98 | SYSCALL_SPU(truncate) |