diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-28 21:02:25 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-28 21:02:25 +0200 |
| commit | 46d5c95b135f73051df7bc001e2d5c8e77e54cd6 (patch) | |
| tree | b9f5b17cfa23a9620b85359ac6c514b208d299fb /arch | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa... (diff) | |
| parent | [MIPS] Fix fallocate on o32 binary compat ABI (diff) | |
| download | linux-46d5c95b135f73051df7bc001e2d5c8e77e54cd6.tar.xz linux-46d5c95b135f73051df7bc001e2d5c8e77e54cd6.zip | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Fix fallocate on o32 binary compat ABI
[MIPS] Fix CONFIG_BUILD_ELF64 kernels with symbols in CKSEG0.
[MIPS] IP32: Fix initialization of UART base addresses.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/kernel/scall64-o32.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S index b3ed731a24c6..dd68afce7da5 100644 --- a/arch/mips/kernel/scall64-o32.S +++ b/arch/mips/kernel/scall64-o32.S @@ -525,5 +525,5 @@ sys_call_table: PTR compat_sys_signalfd PTR compat_sys_timerfd PTR sys_eventfd - PTR sys_fallocate /* 4320 */ + PTR sys32_fallocate /* 4320 */ .size sys_call_table,.-sys_call_table |