diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-28 15:02:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-28 15:02:25 -0400 |
| commit | 46d5c95b135f73051df7bc001e2d5c8e77e54cd6 (patch) | |
| tree | b9f5b17cfa23a9620b85359ac6c514b208d299fb /arch | |
| parent | ae000eec2c6aa785e1a85bea6e2f612fb826859a (diff) | |
| parent | 422efb17eee0471baf4e1876ac9e8ba4c9e7a37a (diff) | |
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: | |||
| 525 | PTR compat_sys_signalfd | 525 | PTR compat_sys_signalfd |
| 526 | PTR compat_sys_timerfd | 526 | PTR compat_sys_timerfd |
| 527 | PTR sys_eventfd | 527 | PTR sys_eventfd |
| 528 | PTR sys_fallocate /* 4320 */ | 528 | PTR sys32_fallocate /* 4320 */ |
| 529 | .size sys_call_table,.-sys_call_table | 529 | .size sys_call_table,.-sys_call_table |