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

Commit 86c7654f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'metag-fixes-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag 

Pull Metag arch and asm-generic fixes from James Hogan:

 - Add the new sched_setattr/sched_getattr syscalls to the asm-generic
   syscall list, which is used by arc, arm64, c6x, hexagon, metag,
  openrisc, score, tile, and unicore32.

 - An IRQ affinity bug fix for metag to prevent interrupts being
   vectored to offline CPUs when their affinity is changed via
   /proc/irq/ (thanks tglx).

* tag 'metag-fixes-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
  irq-metag*: stop set_affinity vectoring to offline cpus
  asm-generic: add sched_setattr/sched_getattr syscalls
parents 3ebd3da6 f229006e

drivers/irqchip/irq-metag-ext.c

+1 −1
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ static int meta_intc_set_affinity(struct irq_data *data, 
	 * one cpu (the interrupt code doesn't support it), so we just

	 * pick the first cpu we find in 'cpumask'.

	 */

	cpu = cpumask_any(cpumask);

	cpu = cpumask_any_and(cpumask, cpu_online_mask);

	thread = cpu_2_hwthread_id[cpu];



	metag_out32(TBI_TRIG_VEC(TBID_SIGNUM_TR2(thread)), vec_addr);

drivers/irqchip/irq-metag.c

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static int metag_internal_irq_set_affinity(struct irq_data *data, 
	 * one cpu (the interrupt code doesn't support it), so we just

	 * pick the first cpu we find in 'cpumask'.

	 */

	cpu = cpumask_any(cpumask);

	cpu = cpumask_any_and(cpumask, cpu_online_mask);

	thread = cpu_2_hwthread_id[cpu];



	metag_out32(TBI_TRIG_VEC(TBID_SIGNUM_TR1(thread)),

include/uapi/asm-generic/unistd.h

+5 −1
Original line number Diff line number Diff line
@@ -692,9 +692,13 @@ __SC_COMP(__NR_process_vm_writev, sys_process_vm_writev, \ 
__SYSCALL(__NR_kcmp, sys_kcmp)

#define __NR_finit_module 273

__SYSCALL(__NR_finit_module, sys_finit_module)

#define __NR_sched_setattr 274

__SYSCALL(__NR_sched_setattr, sys_sched_setattr)

#define __NR_sched_getattr 275

__SYSCALL(__NR_sched_getattr, sys_sched_getattr)



#undef __NR_syscalls

#define __NR_syscalls 274

#define __NR_syscalls 276



/*

 * All syscalls below here should go away really,