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

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

Signed-off-by: default avatarMatthew Wilcox <willy@linux.intel.com>
parent d7b1acd3
...@@ -241,7 +241,7 @@ ...@@ -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 @@ ...@@ -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. ...@@ -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
......
...@@ -44,8 +44,8 @@ ...@@ -44,8 +44,8 @@
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/semaphore.h>
#include <asm/semaphore.h>
#include <asm/sal.h> #include <asm/sal.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/genhd.h> #include <linux/genhd.h>
#include <linux/kallsyms.h> #include <linux/kallsyms.h>
#include <asm/semaphore.h> #include <linux/semaphore.h>
#include "base.h" #include "base.h"
#include "power/power.h" #include "power/power.h"
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
#include <linux/kobject.h> #include <linux/kobject.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/cdev.h> #include <linux/cdev.h>
#include <linux/semaphore.h>
#include <asm/sn/types.h> #include <asm/sn/types.h>
#include <asm/semaphore.h>
#define CHUNKSIZE 127 #define CHUNKSIZE 127
......
...@@ -26,7 +26,8 @@ ...@@ -26,7 +26,8 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/idr.h> #include <linux/idr.h>
#include <linux/string.h> #include <linux/string.h>
#include <asm/semaphore.h> #include <linux/rwsem.h>
#include <linux/semaphore.h>
#include <asm/system.h> #include <asm/system.h>
#include <linux/ctype.h> #include <linux/ctype.h>
#include "fw-transaction.h" #include "fw-transaction.h"
......
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
#include <linux/completion.h> #include <linux/completion.h>
#include <linux/hardirq.h> #include <linux/hardirq.h>
#include <linux/irqflags.h> #include <linux/irqflags.h>
#include <linux/semaphore.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/semaphore.h>
#include "i2c-core.h" #include "i2c-core.h"
......
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/freezer.h> #include <linux/freezer.h>
#include <linux/semaphore.h>
#include <asm/atomic.h> #include <asm/atomic.h>
#include <asm/semaphore.h>
#include "csr.h" #include "csr.h"
#include "highlevel.h" #include "highlevel.h"
......
...@@ -46,9 +46,9 @@ ...@@ -46,9 +46,9 @@
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/kref.h> #include <linux/kref.h>
#include <linux/compat.h> #include <linux/compat.h>
#include <linux/semaphore.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/semaphore.h>
#include <rdma/ib_mad.h> #include <rdma/ib_mad.h>
#include <rdma/ib_user_mad.h> #include <rdma/ib_user_mad.h>
......
...@@ -46,8 +46,7 @@ ...@@ -46,8 +46,7 @@
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/semaphore.h>
#include <asm/semaphore.h>
#include "mthca_provider.h" #include "mthca_provider.h"
#include "mthca_doorbell.h" #include "mthca_doorbell.h"
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/string.h> #include <linux/string.h>
#include <asm/semaphore.h> #include <linux/semaphore.h>
#define PREFIX "HP SDC MLC: " #define PREFIX "HP SDC MLC: "
......
...@@ -37,9 +37,9 @@ ...@@ -37,9 +37,9 @@
#include <linux/device.h> #include <linux/device.h>
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/semaphore.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/semaphore.h>
#ifdef CONFIG_PPC #ifdef CONFIG_PPC
#include <asm/prom.h> #include <asm/prom.h>
#include <asm/machdep.h> #include <asm/machdep.h>
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <asm/semaphore.h> #include <linux/semaphore.h>
#include <asm/prom.h> #include <asm/prom.h>
#include <asm/smu.h> #include <asm/smu.h>
#include <asm/pmac_low_i2c.h> #include <asm/pmac_low_i2c.h>
......
...@@ -103,8 +103,8 @@ DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " Richard Procter <rnp@paradise.net. ...@@ -103,8 +103,8 @@ DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " Richard Procter <rnp@paradise.net.
#include <linux/ethtool.h> #include <linux/ethtool.h>
#include <linux/completion.h> #include <linux/completion.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/semaphore.h>
#include <asm/semaphore.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/io.h> #include <asm/io.h>
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/ip.h> #include <linux/ip.h>
#include <linux/tcp.h> #include <linux/tcp.h>
#include <asm/semaphore.h> #include <linux/semaphore.h>
#include <asm/atomic.h> #include <asm/atomic.h>
#define SIXPACK_VERSION "Revision: 0.3.0" #define SIXPACK_VERSION "Revision: 0.3.0"
......
...@@ -38,11 +38,11 @@ ...@@ -38,11 +38,11 @@
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/mempool.h> #include <linux/mempool.h>
#include <linux/semaphore.h>
#include <asm/ccwdev.h> #include <asm/ccwdev.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/atomic.h> #include <asm/atomic.h>
#include <asm/semaphore.h>
#include <asm/timex.h> #include <asm/timex.h>
#include <asm/debug.h> #include <asm/debug.h>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include <linux/blkdev.h> #include <linux/blkdev.h>
#include <linux/delay.h> /* ssleep prototype */ #include <linux/delay.h> /* ssleep prototype */
#include <linux/kthread.h> #include <linux/kthread.h>
#include <asm/semaphore.h> #include <linux/semaphore.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include "aacraid.h" #include "aacraid.h"
......
...@@ -41,11 +41,11 @@ ...@@ -41,11 +41,11 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/semaphore.h>
#include <scsi/scsi.h> #include <scsi/scsi.h>
#include <scsi/scsi_host.h> #include <scsi/scsi_host.h>
#include <scsi/scsi_device.h> #include <scsi/scsi_device.h>
#include <scsi/scsi_cmnd.h> #include <scsi/scsi_cmnd.h>
#include <asm/semaphore.h>
#include "aacraid.h" #include "aacraid.h"
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/completion.h> #include <linux/completion.h>
#include <linux/blkdev.h> #include <linux/blkdev.h>
#include <asm/semaphore.h> #include <linux/semaphore.h>
#include "aacraid.h" #include "aacraid.h"
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#define _MEGARAID_IOCTL_H_ #define _MEGARAID_IOCTL_H_
#include <linux/types.h> #include <linux/types.h>
#include <asm/semaphore.h> #include <linux/semaphore.h>
#include "mbox_defs.h" #include "mbox_defs.h"
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <linux/firmware.h> #include <linux/firmware.h>
#include <linux/aer.h> #include <linux/aer.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <asm/semaphore.h> #include <linux/semaphore.h>
#include <scsi/scsi.h> #include <scsi/scsi.h>
#include <scsi/scsi_host.h> #include <scsi/scsi_host.h>
......
...@@ -38,8 +38,8 @@ ...@@ -38,8 +38,8 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/pnp.h> #include <linux/pnp.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/semaphore.h>
#include <asm/semaphore.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <linux/version.h> #include <linux/version.h>
#include <linux/rbtree.h> #include <linux/rbtree.h>
#include <linux/posix_acl.h> #include <linux/posix_acl.h>
#include <asm/semaphore.h> #include <linux/semaphore.h>
struct jffs2_inode_info { struct jffs2_inode_info {
/* We need an internal mutex similar to inode->i_mutex. /* We need an internal mutex similar to inode->i_mutex.
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/completion.h> #include <linux/completion.h>
#include <asm/semaphore.h> #include <linux/semaphore.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/list.h> #include <linux/list.h>
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include <asm/system.h> #include <asm/system.h>
#include <linux/time.h> #include <linux/time.h>
#include <asm/semaphore.h> #include <linux/semaphore.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/reiserfs_fs.h> #include <linux/reiserfs_fs.h>
......
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
#include <linux/time.h> #include <linux/time.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/semaphore.h>
#include <asm/atomic.h> #include <asm/atomic.h>
#include <asm/semaphore.h>
/* /*
* sema_t structure just maps to struct semaphore in Linux kernel. * sema_t structure just maps to struct semaphore in Linux kernel.
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/pm.h> #include <linux/pm.h>
#include <asm/semaphore.h> #include <linux/semaphore.h>
#include <asm/atomic.h> #include <asm/atomic.h>
#include <asm/device.h> #include <asm/device.h>
......
...@@ -287,9 +287,9 @@ extern int dir_notify_enable; ...@@ -287,9 +287,9 @@ extern int dir_notify_enable;
#include <linux/pid.h> #include <linux/pid.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/capability.h> #include <linux/capability.h>
#include <linux/semaphore.h>
#include <asm/atomic.h> #include <asm/atomic.h>
#include <asm/semaphore.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
struct export_operations; struct export_operations;
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include <linux/hil.h> #include <linux/hil.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <asm/semaphore.h> #include <linux/semaphore.h>
#include <linux/serio.h> #include <linux/serio.h>
#include <linux/list.h> #include <linux/list.h>
......
...@@ -33,9 +33,9 @@ ...@@ -33,9 +33,9 @@
#include <linux/mempool.h> #include <linux/mempool.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#include <linux/semaphore.h> /* Needed for MUTEX init macros */
#include <asm/io.h> #include <asm/io.h>
#include <asm/semaphore.h> /* Needed for MUTEX init macros */
/* message queue empty */ /* message queue empty */
#define I2O_QUEUE_EMPTY 0xffffffff #define I2O_QUEUE_EMPTY 0xffffffff
......
...@@ -18,8 +18,7 @@ ...@@ -18,8 +18,7 @@
#include <linux/sysdev.h> #include <linux/sysdev.h>
#include <linux/node.h> #include <linux/node.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/semaphore.h>
#include <asm/semaphore.h>
struct memory_block { struct memory_block {
unsigned long phys_index; unsigned long phys_index;
......
...@@ -101,9 +101,9 @@ typedef enum { ...@@ -101,9 +101,9 @@ typedef enum {
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/irqreturn.h> #include <linux/irqreturn.h>
#include <linux/semaphore.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/semaphore.h>
/* Define this later. */ /* Define this later. */
struct parport; struct parport;
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/kallsyms.h> #include <linux/kallsyms.h>
#include <asm/semaphore.h> #include <linux/semaphore.h>
/* /*
* The 'big kernel semaphore' * The 'big kernel semaphore'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment