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

Commit 7d7c4d06 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus:
  MIPS: O32 compat/N32: Fix to use compat syscall wrappers for AIO syscalls.
  MAINTAINERS: Change list for ioc_serial to linux-serial.
  SERIAL: ioc3_serial: Return -ENOMEM on memory allocation failure
  MIPS: jz4740: Fix Kbuild Platform file.
  MIPS: Repair Kbuild make clean breakage.
parents 531295e6 e2cc502c

MAINTAINERS

+1 −1
Original line number Original line Diff line number Diff line
@@ -3162,7 +3162,7 @@ F: drivers/net/ioc3-eth.c 




IOC3 SERIAL DRIVER

IOC3 SERIAL DRIVER

M:	Pat Gefre <pfg@sgi.com>

M:	Pat Gefre <pfg@sgi.com>

L:	linux-mips@linux-mips.org

L:	linux-serial@vger.kernel.org

S:	Maintained

S:	Maintained

F:	drivers/serial/ioc3_serial.c

F:	drivers/serial/ioc3_serial.c

arch/mips/Kbuild

+4 −0
Original line number Original line Diff line number Diff line
@@ -7,6 +7,10 @@ subdir-ccflags-y := -Werror 
include arch/mips/Kbuild.platforms

include arch/mips/Kbuild.platforms

obj-y := $(platform-y)

obj-y := $(platform-y)





# make clean traverses $(obj-) without having included .config, so

# everything ends up here

obj- := $(platform-)



# mips object files

# mips object files

# The object files are linked as core-y files would be linked

# The object files are linked as core-y files would be linked

arch/mips/dec/Platform

+1 −1
Original line number Original line Diff line number Diff line 
#

#

# DECstation family

# DECstation family

#

#

platform-$(CONFIG_MACH_DECSTATION)	= dec/

platform-$(CONFIG_MACH_DECSTATION)	+= dec/

cflags-$(CONFIG_MACH_DECSTATION)	+= \

cflags-$(CONFIG_MACH_DECSTATION)	+= \

			-I$(srctree)/arch/mips/include/asm/mach-dec

			-I$(srctree)/arch/mips/include/asm/mach-dec

libs-$(CONFIG_MACH_DECSTATION)		+= arch/mips/dec/prom/

libs-$(CONFIG_MACH_DECSTATION)		+= arch/mips/dec/prom/

arch/mips/jz4740/Platform

+1 −1
Original line number Original line Diff line number Diff line 
core-$(CONFIG_MACH_JZ4740)	+= arch/mips/jz4740/

platform-$(CONFIG_MACH_JZ4740)	+= jz4740/

cflags-$(CONFIG_MACH_JZ4740)	+= -I$(srctree)/arch/mips/include/asm/mach-jz4740

cflags-$(CONFIG_MACH_JZ4740)	+= -I$(srctree)/arch/mips/include/asm/mach-jz4740

load-$(CONFIG_MACH_JZ4740)	+= 0xffffffff80010000
 
load-$(CONFIG_MACH_JZ4740)	+= 0xffffffff80010000

arch/mips/kernel/scall64-n32.S

+3 −3
Original line number Original line Diff line number Diff line
@@ -322,10 +322,10 @@ EXPORT(sysn32_call_table) 
	PTR	sys_cacheflush

	PTR	sys_cacheflush

	PTR	sys_cachectl

	PTR	sys_cachectl

	PTR	sys_sysmips

	PTR	sys_sysmips

	PTR	sys_io_setup			/* 6200 */

	PTR	compat_sys_io_setup			/* 6200 */

	PTR	sys_io_destroy

	PTR	sys_io_destroy

	PTR	sys_io_getevents

	PTR	compat_sys_io_getevents

	PTR	sys_io_submit

	PTR	compat_sys_io_submit

	PTR	sys_io_cancel

	PTR	sys_io_cancel

	PTR	sys_exit_group			/* 6205 */

	PTR	sys_exit_group			/* 6205 */

	PTR	sys_lookup_dcookie

	PTR	sys_lookup_dcookie