diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-27 23:21:18 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-27 23:26:01 -0400 |
| commit | 82268da1b130f763d22d04f7d016bbf6fc8815c2 (patch) | |
| tree | 9803f361556d10708313e980428e63a18162e667 /arch/powerpc | |
| parent | 6e15cf04860074ad032e88c306bea656bbdd0f22 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'linus' into percpu-cpumask-x86-for-linus-2
Conflicts:
arch/sparc/kernel/time_64.c
drivers/gpu/drm/drm_proc.c
Manual merge to resolve build warning due to phys_addr_t type change
on x86:
drivers/gpu/drm/drm_info.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/powerpc')
| -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 72353f6070a4..fe166491e9dc 100644 --- a/arch/powerpc/include/asm/systbl.h +++ b/arch/powerpc/include/asm/systbl.h | |||
| @@ -65,7 +65,7 @@ SYSCALL(ni_syscall) | |||
| 65 | SYSX(sys_ni_syscall,sys_olduname, sys_olduname) | 65 | SYSX(sys_ni_syscall,sys_olduname, sys_olduname) |
| 66 | COMPAT_SYS_SPU(umask) | 66 | COMPAT_SYS_SPU(umask) |
| 67 | SYSCALL_SPU(chroot) | 67 | SYSCALL_SPU(chroot) |
| 68 | SYSCALL(ustat) | 68 | COMPAT_SYS(ustat) |
| 69 | SYSCALL_SPU(dup2) | 69 | SYSCALL_SPU(dup2) |
| 70 | SYSCALL_SPU(getppid) | 70 | SYSCALL_SPU(getppid) |
| 71 | SYSCALL_SPU(getpgrp) | 71 | SYSCALL_SPU(getpgrp) |