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

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

Merge branch 'core-fixes-for-linus' of... 

Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  futex: fix requeue_pi key imbalance
  futex: Fix typo in FUTEX_WAIT/WAKE_BITSET_PRIVATE definitions
  rcu: Place root rcu_node structure in separate lockdep class
  rcu: Make hot-unplugged CPU relinquish its own RCU callbacks
  rcu: Move rcu_barrier() to rcutree
  futex: Move exit_pi_state() call to release_mm()
  futex: Nullify robust lists after cleanup
  futex: Fix locking imbalance
  panic: Fix panic message visibility by calling bust_spinlocks(0) before dying
  rcu: Replace the rcu_barrier enum with pointer to call_rcu*() function
  rcu: Clean up code based on review feedback from Josh Triplett, part 4
  rcu: Clean up code based on review feedback from Josh Triplett, part 3
  rcu: Fix rcu_lock_map build failure on CONFIG_PROVE_LOCKING=y
  rcu: Clean up code to address Ingo's checkpatch feedback
  rcu: Clean up code based on review feedback from Josh Triplett, part 2
  rcu: Clean up code based on review feedback from Josh Triplett
parents e80fb7e5 da085681

include/linux/futex.h

+2 −2
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ 
#define FUTEX_LOCK_PI_PRIVATE	(FUTEX_LOCK_PI | FUTEX_PRIVATE_FLAG)

#define FUTEX_UNLOCK_PI_PRIVATE	(FUTEX_UNLOCK_PI | FUTEX_PRIVATE_FLAG)

#define FUTEX_TRYLOCK_PI_PRIVATE (FUTEX_TRYLOCK_PI | FUTEX_PRIVATE_FLAG)

#define FUTEX_WAIT_BITSET_PRIVATE	(FUTEX_WAIT_BITS | FUTEX_PRIVATE_FLAG)

#define FUTEX_WAKE_BITSET_PRIVATE	(FUTEX_WAKE_BITS | FUTEX_PRIVATE_FLAG)

#define FUTEX_WAIT_BITSET_PRIVATE	(FUTEX_WAIT_BITSET | FUTEX_PRIVATE_FLAG)

#define FUTEX_WAKE_BITSET_PRIVATE	(FUTEX_WAKE_BITSET | FUTEX_PRIVATE_FLAG)

#define FUTEX_WAIT_REQUEUE_PI_PRIVATE	(FUTEX_WAIT_REQUEUE_PI | \

					 FUTEX_PRIVATE_FLAG)

#define FUTEX_CMP_REQUEUE_PI_PRIVATE	(FUTEX_CMP_REQUEUE_PI | \

include/linux/rcupdate.h

+11 −7
Original line number Diff line number Diff line
@@ -129,12 +129,6 @@ static inline void rcu_read_lock(void) 
	rcu_read_acquire();

}



/**

 * rcu_read_unlock - marks the end of an RCU read-side critical section.

 *

 * See rcu_read_lock() for more information.

 */



/*

 * So where is rcu_write_lock()?  It does not exist, as there is no

 * way for writers to lock out RCU readers.  This is a feature, not
@@ -144,6 +138,12 @@ static inline void rcu_read_lock(void) 
 * used as well.  RCU does not care how the writers keep out of each

 * others' way, as long as they do so.

 */



/**

 * rcu_read_unlock - marks the end of an RCU read-side critical section.

 *

 * See rcu_read_lock() for more information.

 */

static inline void rcu_read_unlock(void)

{

	rcu_read_release();
@@ -196,6 +196,8 @@ static inline void rcu_read_lock_sched(void) 
	__acquire(RCU_SCHED);

	rcu_read_acquire();

}



/* Used by lockdep and tracing: cannot be traced, cannot call lockdep. */

static inline notrace void rcu_read_lock_sched_notrace(void)

{

	preempt_disable_notrace();
@@ -213,6 +215,8 @@ static inline void rcu_read_unlock_sched(void) 
	__release(RCU_SCHED);

	preempt_enable();

}



/* Used by lockdep and tracing: cannot be traced, cannot call lockdep. */

static inline notrace void rcu_read_unlock_sched_notrace(void)

{

	__release(RCU_SCHED);

include/linux/rcutree.h

+6 −7
Original line number Diff line number Diff line
@@ -30,10 +30,14 @@ 
#ifndef __LINUX_RCUTREE_H

#define __LINUX_RCUTREE_H



struct notifier_block;



extern void rcu_sched_qs(int cpu);

extern void rcu_bh_qs(int cpu);



extern int rcu_cpu_notify(struct notifier_block *self,

			  unsigned long action, void *hcpu);

extern int rcu_needs_cpu(int cpu);

extern int rcu_expedited_torture_stats(char *page);



#ifdef CONFIG_TREE_PREEMPT_RCU
@@ -85,16 +89,11 @@ static inline void synchronize_rcu_bh_expedited(void) 


extern void __rcu_init(void);

extern void rcu_check_callbacks(int cpu, int user);

extern void rcu_restart_cpu(int cpu);



extern long rcu_batches_completed(void);

extern long rcu_batches_completed_bh(void);

extern long rcu_batches_completed_sched(void);



static inline void rcu_init_sched(void)

{

}



#ifdef CONFIG_NO_HZ

void rcu_enter_nohz(void);

void rcu_exit_nohz(void);
@@ -107,7 +106,7 @@ static inline void rcu_exit_nohz(void) 
}

#endif /* CONFIG_NO_HZ */



/* A context switch is a grace period for rcutree. */

/* A context switch is a grace period for RCU-sched and RCU-bh. */

static inline int rcu_blocking_is_gp(void)

{

	return num_online_cpus() == 1;

init/main.c

+0 −1
Original line number Diff line number Diff line
@@ -778,7 +778,6 @@ static void __init do_initcalls(void) 
 */

static void __init do_basic_setup(void)

{

	rcu_init_sched(); /* needed by module_init stage. */

	init_workqueues();

	cpuset_init_smp();

	usermodehelper_init();

kernel/exit.c

+0 −2
Original line number Diff line number Diff line
@@ -991,8 +991,6 @@ NORET_TYPE void do_exit(long code) 
	tsk->mempolicy = NULL;

#endif

#ifdef CONFIG_FUTEX

	if (unlikely(!list_empty(&tsk->pi_state_list)))

		exit_pi_state_list(tsk);

	if (unlikely(current->pi_state_cache))

		kfree(current->pi_state_cache);

#endif