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

Commit 429f731d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc 

* 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc:
  Deprecate the asm/semaphore.h files in feature-removal-schedule.
  Convert asm/semaphore.h users to linux/semaphore.h
  security: Remove unnecessary inclusions of asm/semaphore.h
  lib: Remove unnecessary inclusions of asm/semaphore.h
  kernel: Remove unnecessary inclusions of asm/semaphore.h
  include: Remove unnecessary inclusions of asm/semaphore.h
  fs: Remove unnecessary inclusions of asm/semaphore.h
  drivers: Remove unnecessary inclusions of asm/semaphore.h
  net: Remove unnecessary inclusions of asm/semaphore.h
  arch: Remove unnecessary inclusions of asm/semaphore.h
parents 85b375a6 d2f5e808

Documentation/DocBook/kernel-locking.tmpl

+3 −3
Original line number Original line Diff line number Diff line
@@ -241,7 +241,7 @@ 
   </para>

   </para>

   <para>

   <para>

     The third type is a semaphore

     The third type is a semaphore

     (<filename class="headerfile">include/asm/semaphore.h</filename>): it

     (<filename class="headerfile">include/linux/semaphore.h</filename>): it

     can have more than one holder at any time (the number decided at

     can have more than one holder at any time (the number decided at

     initialization time), although it is most commonly used as a

     initialization time), although it is most commonly used as a

     single-holder lock (a mutex).  If you can't get a semaphore, your

     single-holder lock (a mutex).  If you can't get a semaphore, your
@@ -290,7 +290,7 @@ 
     <para>

     <para>

       If you have a data structure which is only ever accessed from

       If you have a data structure which is only ever accessed from

       user context, then you can use a simple semaphore

       user context, then you can use a simple semaphore

       (<filename>linux/asm/semaphore.h</filename>) to protect it.  This 

       (<filename>linux/linux/semaphore.h</filename>) to protect it.  This

       is the most trivial case: you initialize the semaphore to the number 

       is the most trivial case: you initialize the semaphore to the number 

       of resources available (usually 1), and call

       of resources available (usually 1), and call

       <function>down_interruptible()</function> to grab the semaphore, and 

       <function>down_interruptible()</function> to grab the semaphore, and
@@ -1656,7 +1656,7 @@ the amount of locking which needs to be done. 
 #include &lt;linux/slab.h&gt;

 #include &lt;linux/slab.h&gt;

 #include &lt;linux/string.h&gt;

 #include &lt;linux/string.h&gt;

+#include &lt;linux/rcupdate.h&gt;

+#include &lt;linux/rcupdate.h&gt;

 #include &lt;asm/semaphore.h&gt;

 #include &lt;linux/semaphore.h&gt;

 #include &lt;asm/errno.h&gt;

 #include &lt;asm/errno.h&gt;





 struct object

 struct object

Documentation/feature-removal-schedule.txt

+8 −0
Original line number Original line Diff line number Diff line
@@ -298,3 +298,11 @@ Why: /sys/fs/o2cb is the proper location for this information - /sys/o2cb 
	ocfs2-tools. 2 years should be sufficient time to phase in new versions

	ocfs2-tools. 2 years should be sufficient time to phase in new versions

	which know to look in /sys/fs/o2cb.

	which know to look in /sys/fs/o2cb.

Who:	ocfs2-devel@oss.oracle.com

Who:	ocfs2-devel@oss.oracle.com



---------------------------



What:	asm/semaphore.h

When:	2.6.26

Why:	Implementation became generic; users should now include

	linux/semaphore.h instead.

Who:	Matthew Wilcox <willy@linux.intel.com>

arch/arm/common/rtctime.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <linux/mutex.h>

#include <linux/mutex.h>





#include <asm/rtc.h>

#include <asm/rtc.h>

#include <asm/semaphore.h>





static DECLARE_WAIT_QUEUE_HEAD(rtc_wait);

static DECLARE_WAIT_QUEUE_HEAD(rtc_wait);

static struct fasync_struct *rtc_async_queue;

static struct fasync_struct *rtc_async_queue;

arch/arm/mach-aaec2000/clock.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -18,8 +18,6 @@ 
#include <linux/clk.h>

#include <linux/clk.h>

#include <linux/mutex.h>

#include <linux/mutex.h>





#include <asm/semaphore.h>



#include "clock.h"

#include "clock.h"





static LIST_HEAD(clocks);

static LIST_HEAD(clocks);

arch/arm/mach-at91/clock.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/clk.h>

#include <linux/clk.h>





#include <asm/semaphore.h>

#include <asm/io.h>

#include <asm/io.h>

#include <asm/mach-types.h>

#include <asm/mach-types.h>