projects/linux·commit 46d5c95b

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

46d5c95b · Linus Torvalds <[email protected]> · 2007-09-28 12:02:25 -07:00

* '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.
Commit
46d5c95b135f73051df7bc001e2d5c8e77e54cd6
Parents
ae000eec · 422efb17

Merge commit. Changes below are compared with the first parent: ae000eec.

Changes

1 files changed · +1 −1

FileStatusAddDelContent
arch/mips/kernel/scall64-o32.Smodified+1−1View file

arch/mips/kernel/scall64-o32.S

View file
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index b3ed731..dd68afc 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