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

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.

Linus Torvalds 18 years ago

parent

ae000eec2c 422efb17ee

commit

46d5c95b13

1 changed files with 1 additions and 1 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 1
						
arch/mips/kernel/scall64-o32.S
							 
								View File
							
				@@ -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