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

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

Merge branches 'timers-urgent-for-linus', 'irq-urgent-for-linus' and... 

Merge branches 'timers-urgent-for-linus', 'irq-urgent-for-linus' and 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull {timer,irq,core} fixes from Thomas Gleixner:

 - timer: bug fix for a cpu hotplug race.

 - irq: single bugfix for a wrong return value, which prevents the
   calling function to invoke the software fallback.

 - core: bugfix which plugs two race confitions which can cause hotplug
   per cpu threads to end up on the wrong cpu.

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  hrtimer: Don't reinitialize a cpu_base lock on CPU_UP

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip: gic: fix irq_trigger return

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  kthread: Prevent unpark race which puts threads on the wrong cpu
parents 41ef2d56 84cc8fd2 bad9a43a f2530dc7

drivers/irqchip/irq-gic.c

+2 −1
Original line number Diff line number Diff line
@@ -236,7 +236,8 @@ static int gic_retrigger(struct irq_data *d) 
	if (gic_arch_extn.irq_retrigger)

		return gic_arch_extn.irq_retrigger(d);



	return -ENXIO;

	/* the genirq layer expects 0 if we can't retrigger in hardware */

	return 0;

}



#ifdef CONFIG_SMP

fs/proc/array.c

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ static const char * const task_state_array[] = { 
	"x (dead)",		/*  64 */

	"K (wakekill)",		/* 128 */

	"W (waking)",		/* 256 */

	"P (parked)",		/* 512 */

};



static inline const char *get_task_state(struct task_struct *tsk)

include/linux/sched.h

+3 −2
Original line number Diff line number Diff line
@@ -163,9 +163,10 @@ print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq) 
#define TASK_DEAD		64

#define TASK_WAKEKILL		128

#define TASK_WAKING		256

#define TASK_STATE_MAX		512

#define TASK_PARKED		512

#define TASK_STATE_MAX		1024



#define TASK_STATE_TO_CHAR_STR "RSDTtZXxKW"

#define TASK_STATE_TO_CHAR_STR "RSDTtZXxKWP"



extern char ___assert_task_state[1 - 2*!!(

		sizeof(TASK_STATE_TO_CHAR_STR)-1 != ilog2(TASK_STATE_MAX)+1)];

include/trace/events/sched.h

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ TRACE_EVENT(sched_switch, 
		  __print_flags(__entry->prev_state & (TASK_STATE_MAX-1), "|",

				{ 1, "S"} , { 2, "D" }, { 4, "T" }, { 8, "t" },

				{ 16, "Z" }, { 32, "X" }, { 64, "x" },

				{ 128, "W" }) : "R",

				{ 128, "K" }, { 256, "W" }, { 512, "P" }) : "R",

		__entry->prev_state & TASK_STATE_MAX ? "+" : "",

		__entry->next_comm, __entry->next_pid, __entry->next_prio)

);

kernel/hrtimer.c

+1 −2
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ 
DEFINE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases) =

{



	.lock = __RAW_SPIN_LOCK_UNLOCKED(hrtimer_bases.lock),

	.clock_base =

	{

		{
@@ -1642,8 +1643,6 @@ static void __cpuinit init_hrtimers_cpu(int cpu) 
	struct hrtimer_cpu_base *cpu_base = &per_cpu(hrtimer_bases, cpu);

	int i;



	raw_spin_lock_init(&cpu_base->lock);



	for (i = 0; i < HRTIMER_MAX_CLOCK_BASES; i++) {

		cpu_base->clock_base[i].cpu_base = cpu_base;

		timerqueue_init_head(&cpu_base->clock_base[i].active);