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

Commit f564c5fe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 423ab71a b887d3f2

arch/mips/kernel/process.c

+3 −2
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 * for more details.

 *

 * Copyright (C) 1994 - 1999, 2000 by Ralf Baechle and others.

 * Copyright (C) 2005, 2006 by Ralf Baechle (ralf@linux-mips.org)

 * Copyright (C) 1999, 2000 Silicon Graphics, Inc.

 * Copyright (C) 2004 Thiemo Seufer

 */
@@ -58,8 +59,8 @@ ATTRIB_NORET void cpu_idle(void) 
	}

}



extern int do_signal(sigset_t *oldset, struct pt_regs *regs);

extern int do_signal32(sigset_t *oldset, struct pt_regs *regs);

extern void do_signal(struct pt_regs *regs);

extern void do_signal32(struct pt_regs *regs);



/*

 * Native o32 and N64 ABI without DSP ASE

arch/mips/kernel/scall32-o32.S

+17 −0
Original line number Diff line number Diff line
@@ -617,6 +617,23 @@ einval: li v0, -EINVAL 
	sys	sys_inotify_init	0

	sys	sys_inotify_add_watch	3	/* 4285 */

	sys	sys_inotify_rm_watch	2

	sys	sys_migrate_pages	4

	sys	sys_openat		4

	sys	sys_mkdirat		3

	sys	sys_mknodat		4	/* 4290 */

	sys	sys_fchownat		5

	sys	sys_futimesat		3

	sys	sys_newfstatat		4

	sys	sys_unlinkat		3

	sys	sys_renameat		4	/* 4295 */

	sys	sys_linkat		4

	sys	sys_symlinkat		3

	sys	sys_readlinkat		4

	sys	sys_fchmodat		3

	sys	sys_faccessat		3	/* 4300 */

	sys	sys_pselect6		6

	sys	sys_ppoll		5

	sys	sys_unshare		1

	.endm



	/* We pre-compute the number of _instruction_ bytes needed to

arch/mips/kernel/scall64-64.S

+17 −0
Original line number Diff line number Diff line
@@ -443,3 +443,20 @@ sys_call_table: 
	PTR	sys_inotify_init

	PTR	sys_inotify_add_watch

	PTR	sys_inotify_rm_watch		/* 5245 */

	PTR	sys_migrate_pages

	PTR	sys_openat

	PTR	sys_mkdirat

	PTR	sys_mknodat

	PTR	sys_fchownat			/* 5250 */

	PTR	sys_futimesat

	PTR	sys_newfstatat

	PTR	sys_unlinkat

	PTR	sys_renameat

	PTR	sys_linkat			/* 5255 */

	PTR	sys_symlinkat

	PTR	sys_readlinkat

	PTR	sys_fchmodat

	PTR	sys_faccessat

	PTR	sys_pselect6			/* 5260 */

	PTR	sys_ppoll

	PTR	sys_unshare

arch/mips/kernel/scall64-n32.S

+17 −0
Original line number Diff line number Diff line
@@ -369,3 +369,20 @@ EXPORT(sysn32_call_table) 
	PTR	sys_inotify_init

	PTR	sys_inotify_add_watch

	PTR	sys_inotify_rm_watch

	PTR	sys_migrate_pages		/* 6250 */

	PTR	sys_openat

	PTR	sys_mkdirat

	PTR	sys_mknodat

	PTR	sys_fchownat

	PTR	sys_futimesat			/* 6255 */

	PTR	sys_newfstatat

	PTR	sys_unlinkat

	PTR	sys_renameat

	PTR	sys_linkat

	PTR	sys_symlinkat			/* 6260 */

	PTR	sys_readlinkat

	PTR	sys_fchmodat

	PTR	sys_faccessat

	PTR	sys_pselect6

	PTR	sys_ppoll			/* 6265 */

	PTR	sys_unshare

arch/mips/kernel/scall64-o32.S

+17 −0
Original line number Diff line number Diff line
@@ -491,4 +491,21 @@ sys_call_table: 
	PTR	sys_inotify_init

	PTR	sys_inotify_add_watch		/* 4285 */

	PTR	sys_inotify_rm_watch

	PTR	sys_migrate_pages

	PTR	compat_sys_openat

	PTR	sys_mkdirat

	PTR	sys_mknodat			/* 4290 */

	PTR	sys_fchownat

	PTR	compat_sys_futimesat

	PTR	compat_sys_newfstatat

	PTR	sys_unlinkat

	PTR	sys_renameat			/* 4295 */

	PTR	sys_linkat

	PTR	sys_symlinkat

	PTR	sys_readlinkat

	PTR	sys_fchmodat

	PTR	sys_faccessat			/* 4300 */

	PTR	sys_pselect6

	PTR	sys_ppoll

	PTR	sys_unshare

	.size	sys_call_table,.-sys_call_table