Commit 22353f35 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 smp barriers in test_and_{change,clear,set}_bit
  [MIPS] Fix IP27 build
  [MIPS] Fix modpost warnings by making start_secondary __cpuinit
  [MIPS] SMTC: Fix build error caused by nonsense code.
  [MIPS] SMTC: The MT ASE requires to initialize c0_pagemask and c0_wired.
  [MIPS] SMTC: Don't continue in set_vi_srs_handler on detected bad arguments.
  [MIPS] SMTC: Fix warning.
  [MIPS] Wire up utimensat, signalfd, timerfd, eventfd
  [MIPS] Atlas: Fix build.
  [MIPS] Always install the DSP exception handler.
  [MIPS] SMTC: Don't set and restore irqregs ptr from self_ipi.
  [MIPS] Fix KMODE for the R3000
parents 3e2ce4da ff72b7a6

arch/mips/kernel/scall32-o32.S

+5 −1
Original line number Diff line number Diff line
@@ -657,7 +657,11 @@ einval: li v0, -EINVAL 
	sys	sys_getcpu		3

	sys	sys_epoll_pwait		6

	sys	sys_ioprio_set		3

	sys	sys_ioprio_get		2

	sys	sys_ioprio_get		2	/* 4315 */

	sys	sys_utimensat		4

	sys	sys_signalfd		3

	sys	sys_timerfd		4

	sys	sys_eventfd		1

	.endm



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

arch/mips/kernel/scall64-64.S

+4 −0
Original line number Diff line number Diff line
@@ -473,4 +473,8 @@ sys_call_table: 
	PTR	sys_epoll_pwait

	PTR	sys_ioprio_set

	PTR	sys_ioprio_get

	PTR	sys_utimensat			/* 5275 */

	PTR	sys_signalfd

	PTR	sys_timerfd

	PTR	sys_eventfd

	.size	sys_call_table,.-sys_call_table

arch/mips/kernel/scall64-n32.S

+4 −0
Original line number Diff line number Diff line
@@ -399,4 +399,8 @@ EXPORT(sysn32_call_table) 
	PTR	compat_sys_epoll_pwait

	PTR	sys_ioprio_set

	PTR	sys_ioprio_get

	PTR	compat_sys_utimensat

	PTR	compat_sys_signalfd		/* 5280 */

	PTR	compat_sys_timerfd

	PTR	sys_eventfd

	.size	sysn32_call_table,.-sysn32_call_table

arch/mips/kernel/scall64-o32.S

+4 −0
Original line number Diff line number Diff line
@@ -521,4 +521,8 @@ sys_call_table: 
	PTR	compat_sys_epoll_pwait

	PTR	sys_ioprio_set

	PTR	sys_ioprio_get			/* 4315 */

	PTR	compat_sys_utimensat

	PTR	compat_sys_signalfd

	PTR	compat_sys_timerfd

	PTR	sys_eventfd

	.size	sys_call_table,.-sys_call_table

arch/mips/kernel/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ extern ATTRIB_NORET void cpu_idle(void); 
 * First C code run on the secondary CPUs after being started up by

 * the master.

 */

asmlinkage void start_secondary(void)

asmlinkage __cpuinit void start_secondary(void)

{

	unsigned int cpu;

CRA Git | Maintained and supported by SUSTech CRA and CCSE