Skip to content

L
linux-davinci
Commit 46d5c95b authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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.
parents ae000eec 422efb17
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
arch/mips/kernel/scall64-o32.S
View file @ 46d5c95b
...@@ -525,5 +525,5 @@ sys_call_table: ...@@ -525,5 +525,5 @@ sys_call_table:
PTR compat_sys_signalfd PTR compat_sys_signalfd
PTR compat_sys_timerfd PTR compat_sys_timerfd
PTR sys_eventfd PTR sys_eventfd
PTR sys_fallocate /* 4320 */ PTR sys32_fallocate /* 4320 */
.size sys_call_table,.-sys_call_table .size sys_call_table,.-sys_call_table
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment