Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46d5c95b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

arch/mips/kernel/scall64-o32.S

+1 −1
Original line number Diff line number Diff line
@@ -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