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

Commit 79637a41 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:
  gcc-4.6: kernel/*: Fix unused but set warnings
  mutex: Fix annotations to include it in kernel-locking docbook
  pid: make setpgid() system call use RCU read-side critical section
  MAINTAINERS: Add RCU's public git tree
parents 899edae6 b3bd3de6

Documentation/DocBook/kernel-locking.tmpl

+6 −0
Original line number Diff line number Diff line
@@ -1961,6 +1961,12 @@ machines due to caching. 
   </sect1>

  </chapter>



  <chapter id="apiref">

   <title>Mutex API reference</title>

!Iinclude/linux/mutex.h

!Ekernel/mutex.c

  </chapter>



  <chapter id="references">

   <title>Further reading</title>

Documentation/mutex-design.txt

+2 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ firstly, there's nothing wrong with semaphores. But if the simpler 
mutex semantics are sufficient for your code, then there are a couple

of advantages of mutexes:



 - 'struct mutex' is smaller on most architectures: .e.g on x86,

 - 'struct mutex' is smaller on most architectures: E.g. on x86,

   'struct semaphore' is 20 bytes, 'struct mutex' is 16 bytes.

   A smaller structure size means less RAM footprint, and better

   CPU-cache utilization.
@@ -136,3 +136,4 @@ the APIs of 'struct mutex' have been streamlined: 
 void mutex_lock_nested(struct mutex *lock, unsigned int subclass);

 int  mutex_lock_interruptible_nested(struct mutex *lock,

                                      unsigned int subclass);

 int atomic_dec_and_mutex_lock(atomic_t *cnt, struct mutex *lock);

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -4810,6 +4810,7 @@ RCUTORTURE MODULE 
M:	Josh Triplett <josh@freedesktop.org>

M:	"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>

S:	Supported

T:	git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git

F:	Documentation/RCU/torture.txt

F:	kernel/rcutorture.c
@@ -4834,6 +4835,7 @@ M: Dipankar Sarma <dipankar@in.ibm.com> 
M:	"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>

W:	http://www.rdrop.com/users/paulmck/rclock/

S:	Supported

T:	git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git

F:	Documentation/RCU/

F:	include/linux/rcu*

F:	include/linux/srcu*

include/linux/mutex.h

+8 −0
Original line number Diff line number Diff line
@@ -78,6 +78,14 @@ struct mutex_waiter { 
# include <linux/mutex-debug.h>

#else

# define __DEBUG_MUTEX_INITIALIZER(lockname)

/**

 * mutex_init - initialize the mutex

 * @mutex: the mutex to be initialized

 *

 * Initialize the mutex to unlocked state.

 *

 * It is not allowed to initialize an already locked mutex.

 */

# define mutex_init(mutex) \

do {							\

	static struct lock_class_key __key;		\

kernel/debug/kdb/kdb_bp.c

+0 −2
Original line number Diff line number Diff line
@@ -274,7 +274,6 @@ static int kdb_bp(int argc, const char **argv) 
	int i, bpno;

	kdb_bp_t *bp, *bp_check;

	int diag;

	int free;

	char *symname = NULL;

	long offset = 0ul;

	int nextarg;
@@ -305,7 +304,6 @@ static int kdb_bp(int argc, const char **argv) 
	/*

	 * Find an empty bp structure to allocate

	 */

	free = KDB_MAXBPT;

	for (bpno = 0, bp = kdb_breakpoints; bpno < KDB_MAXBPT; bpno++, bp++) {

		if (bp->bp_free)

			break;