diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-08 21:11:00 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-08 21:11:00 -0500 |
| commit | 0d514f040ac6629311974889d5b96bcf21c6461a (patch) | |
| tree | af11d40688eabe88f25d21a1af847a761cb3a843 /arch/powerpc/kernel/systbl.S | |
| parent | 5ee1af9f519e6dc5a7d7912e87a1aaec857c8818 (diff) | |
| parent | 1bd79336a426c5e4f3bab142407059ceb12cadf9 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge:
powerpc: Fix various syscall/signal/swapcontext bugs
[PATCH] powerpc: incorrect rmo_top handling in prom_init
[PATCH] powerpc: Fix incorrect pud_ERROR() message
[PATCH] powerpc: Expose SMT and L1 icache snoop userland features
[PATCH] powerpc: Fix windfarm_pm112 not starting all control loops
[PATCH] powerpc: Fix old g5 issues with windfarm
powerpc32: Fix timebase synchronization on 32-bit powermacs
powerpc: Turn off verbose debug output in powermac platform functions
powerpc: Fix might-sleep warning in program check exception handler
Diffstat (limited to 'arch/powerpc/kernel/systbl.S')
| -rw-r--r-- | arch/powerpc/kernel/systbl.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/systbl.S b/arch/powerpc/kernel/systbl.S index 8a9f994ed917..1ad55f0466fd 100644 --- a/arch/powerpc/kernel/systbl.S +++ b/arch/powerpc/kernel/systbl.S | |||
| @@ -288,7 +288,7 @@ COMPAT_SYS(clock_settime) | |||
| 288 | COMPAT_SYS(clock_gettime) | 288 | COMPAT_SYS(clock_gettime) |
| 289 | COMPAT_SYS(clock_getres) | 289 | COMPAT_SYS(clock_getres) |
| 290 | COMPAT_SYS(clock_nanosleep) | 290 | COMPAT_SYS(clock_nanosleep) |
| 291 | COMPAT_SYS(swapcontext) | 291 | SYSX(ppc64_swapcontext,ppc32_swapcontext,ppc_swapcontext) |
| 292 | COMPAT_SYS(tgkill) | 292 | COMPAT_SYS(tgkill) |
| 293 | COMPAT_SYS(utimes) | 293 | COMPAT_SYS(utimes) |
| 294 | COMPAT_SYS(statfs64) | 294 | COMPAT_SYS(statfs64) |