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

Commit 40b3c43f authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'rcu/urgent' of... 

Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu

 into core/urgent

Pull low probability CONFIG_RCU_BOOST=y deadlock fix from Paul E. McKenney.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 9e85a6f9 cba6d0d6

arch/um/drivers/mconsole_kern.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -705,7 +705,6 @@ static void stack_proc(void *arg) 
	struct task_struct *from = current, *to = arg;

	struct task_struct *from = current, *to = arg;





	to->thread.saved_task = from;

	to->thread.saved_task = from;

	rcu_switch_from(from);

	switch_to(from, to, from);

	switch_to(from, to, from);

}

}

include/linux/rcupdate.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -184,7 +184,6 @@ static inline int rcu_preempt_depth(void) 
/* Internal to kernel */

/* Internal to kernel */

extern void rcu_sched_qs(int cpu);

extern void rcu_sched_qs(int cpu);

extern void rcu_bh_qs(int cpu);

extern void rcu_bh_qs(int cpu);

extern void rcu_preempt_note_context_switch(void);

extern void rcu_check_callbacks(int cpu, int user);

extern void rcu_check_callbacks(int cpu, int user);

struct notifier_block;

struct notifier_block;

extern void rcu_idle_enter(void);

extern void rcu_idle_enter(void);

include/linux/rcutiny.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -87,6 +87,10 @@ static inline void kfree_call_rcu(struct rcu_head *head, 




#ifdef CONFIG_TINY_RCU

#ifdef CONFIG_TINY_RCU





static inline void rcu_preempt_note_context_switch(void)

{

}



static inline int rcu_needs_cpu(int cpu, unsigned long *delta_jiffies)

static inline int rcu_needs_cpu(int cpu, unsigned long *delta_jiffies)

{

{

	*delta_jiffies = ULONG_MAX;

	*delta_jiffies = ULONG_MAX;
@@ -95,6 +99,7 @@ static inline int rcu_needs_cpu(int cpu, unsigned long *delta_jiffies) 




#else /* #ifdef CONFIG_TINY_RCU */

#else /* #ifdef CONFIG_TINY_RCU */





void rcu_preempt_note_context_switch(void);

int rcu_preempt_needs_cpu(void);

int rcu_preempt_needs_cpu(void);





static inline int rcu_needs_cpu(int cpu, unsigned long *delta_jiffies)

static inline int rcu_needs_cpu(int cpu, unsigned long *delta_jiffies)
@@ -108,6 +113,7 @@ static inline int rcu_needs_cpu(int cpu, unsigned long *delta_jiffies) 
static inline void rcu_note_context_switch(int cpu)

static inline void rcu_note_context_switch(int cpu)

{

{

	rcu_sched_qs(cpu);

	rcu_sched_qs(cpu);

	rcu_preempt_note_context_switch();

}

}





/*

/*

include/linux/sched.h

+0 −10
Original line number Original line Diff line number Diff line
@@ -1871,22 +1871,12 @@ static inline void rcu_copy_process(struct task_struct *p) 
	INIT_LIST_HEAD(&p->rcu_node_entry);

	INIT_LIST_HEAD(&p->rcu_node_entry);

}

}





static inline void rcu_switch_from(struct task_struct *prev)

{

	if (prev->rcu_read_lock_nesting != 0)

		rcu_preempt_note_context_switch();

}



#else

#else





static inline void rcu_copy_process(struct task_struct *p)

static inline void rcu_copy_process(struct task_struct *p)

{

{

}

}





static inline void rcu_switch_from(struct task_struct *prev)

{

}



#endif

#endif





#ifdef CONFIG_SMP

#ifdef CONFIG_SMP

kernel/rcutree.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -201,6 +201,7 @@ void rcu_note_context_switch(int cpu) 
{

{

	trace_rcu_utilization("Start context switch");

	trace_rcu_utilization("Start context switch");

	rcu_sched_qs(cpu);

	rcu_sched_qs(cpu);

	rcu_preempt_note_context_switch(cpu);

	trace_rcu_utilization("End context switch");

	trace_rcu_utilization("End context switch");

}

}

EXPORT_SYMBOL_GPL(rcu_note_context_switch);

EXPORT_SYMBOL_GPL(rcu_note_context_switch);