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

Commit 6188e10d authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Matthew Wilcox
Browse files

Convert asm/semaphore.h users to linux/semaphore.h

parent d7b1acd3
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@
   </para>
   <para>
     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
     initialization time), although it is most commonly used as a
     single-holder lock (a mutex).  If you can't get a semaphore, your
@@ -290,7 +290,7 @@
     <para>
       If you have a data structure which is only ever accessed from
       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 
       of resources available (usually 1), and call
       <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/string.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;

 struct object
+1 −1
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@
#include <linux/smp.h>
#include <linux/timer.h>
#include <linux/vmalloc.h>
#include <linux/semaphore.h>

#include <asm/semaphore.h>
#include <asm/sal.h>
#include <asm/uaccess.h>

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@
#include <linux/notifier.h>
#include <linux/genhd.h>
#include <linux/kallsyms.h>
#include <asm/semaphore.h>
#include <linux/semaphore.h>

#include "base.h"
#include "power/power.h"
+1 −1
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@
#include <linux/kobject.h>
#include <linux/fs.h>
#include <linux/cdev.h>
#include <linux/semaphore.h>
#include <asm/sn/types.h>
#include <asm/semaphore.h>

#define CHUNKSIZE 127

+2 −1
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@
#include <linux/delay.h>
#include <linux/idr.h>
#include <linux/string.h>
#include <asm/semaphore.h>
#include <linux/rwsem.h>
#include <linux/semaphore.h>
#include <asm/system.h>
#include <linux/ctype.h>
#include "fw-transaction.h"
Loading