From eb293c3e9cdd84f5ae1ab052af76d523cbbabcbe Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Tue, 19 Oct 2004 18:39:25 -0700
Subject: [PATCH] #include <asm/bitops.h> -> #include <linux/bitops.h>

There's no reason to directly #include <asm/bitops.h> since it's
available on all architectures and also included by
#include <linux/bitops.h>.

This patch changes #include <asm/bitops.h> to #include <linux/bitops.h>.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---
 fs/adfs/super.c       | 2 +-
 fs/autofs/inode.c     | 2 +-
 fs/autofs4/inode.c    | 2 +-
 fs/buffer.c           | 2 +-
 fs/coda/sysctl.c      | 2 +-
 fs/devfs/base.c       | 2 +-
 fs/devfs/util.c       | 2 +-
 fs/eventpoll.c        | 2 +-
 fs/ext3/ialloc.c      | 2 +-
 fs/file.c             | 3 +--
 fs/jfs/jfs_incore.h   | 2 +-
 fs/minix/bitmap.c     | 2 +-
 fs/partitions/devfs.c | 2 +-
 fs/proc/generic.c     | 2 +-
 fs/proc/proc_tty.c    | 2 +-
 fs/proc/root.c        | 2 +-
 fs/qnx4/bitmap.c      | 3 +--
 fs/udf/balloc.c       | 2 +-
 fs/ufs/balloc.c       | 2 +-
 fs/ufs/cylinder.c     | 2 +-
 fs/ufs/ialloc.c       | 2 +-
 fs/ufs/super.c        | 2 +-
 22 files changed, 22 insertions(+), 24 deletions(-)

(limited to 'fs')

diff --git a/fs/adfs/super.c b/fs/adfs/super.c
index 87e8694509f7..243963228d10 100644
--- a/fs/adfs/super.c
+++ b/fs/adfs/super.c
@@ -19,8 +19,8 @@
 #include <linux/buffer_head.h>
 #include <linux/vfs.h>
 #include <linux/parser.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
 
diff --git a/fs/autofs/inode.c b/fs/autofs/inode.c
index a50096dd1595..579e432794a8 100644
--- a/fs/autofs/inode.c
+++ b/fs/autofs/inode.c
@@ -15,7 +15,7 @@
 #include <linux/slab.h>
 #include <linux/file.h>
 #include <linux/parser.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include "autofs_i.h"
 #include <linux/module.h>
 
diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
index 3b8e34a7aeb1..72f579c47ca8 100644
--- a/fs/autofs4/inode.c
+++ b/fs/autofs4/inode.c
@@ -15,7 +15,7 @@
 #include <linux/file.h>
 #include <linux/pagemap.h>
 #include <linux/parser.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include "autofs_i.h"
 #include <linux/module.h>
 
diff --git a/fs/buffer.c b/fs/buffer.c
index 2a75b3f9efe4..d4027fca46bc 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -38,7 +38,7 @@
 #include <linux/bio.h>
 #include <linux/notifier.h>
 #include <linux/cpu.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 
 static int fsync_buffers_list(spinlock_t *lock, struct list_head *list);
 static void invalidate_bh_lrus(void);
diff --git a/fs/coda/sysctl.c b/fs/coda/sysctl.c
index fd98626ba280..5b71f47e27dd 100644
--- a/fs/coda/sysctl.c
+++ b/fs/coda/sysctl.c
@@ -19,7 +19,7 @@
 #include <linux/slab.h>
 #include <linux/stat.h>
 #include <linux/ctype.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/uaccess.h>
 #include <linux/utsname.h>
 #include <linux/module.h>
diff --git a/fs/devfs/base.c b/fs/devfs/base.c
index 65e299a2d97e..22e3cf0852aa 100644
--- a/fs/devfs/base.c
+++ b/fs/devfs/base.c
@@ -677,13 +677,13 @@
 #include <linux/rwsem.h>
 #include <linux/sched.h>
 #include <linux/namei.h>
+#include <linux/bitops.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>
-#include <asm/bitops.h>
 #include <asm/atomic.h>
 
 #define DEVFS_VERSION            "2004-01-31"
diff --git a/fs/devfs/util.c b/fs/devfs/util.c
index 06a2d827e3e5..db06d388c9ac 100644
--- a/fs/devfs/util.c
+++ b/fs/devfs/util.c
@@ -71,7 +71,7 @@
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/genhd.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 
 int devfs_register_tape(const char *name)
 {
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 7d6a12f66a6f..b11ab1a9ceee 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -33,7 +33,7 @@
 #include <linux/wait.h>
 #include <linux/eventpoll.h>
 #include <linux/mount.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
 #include <asm/io.h>
diff --git a/fs/ext3/ialloc.c b/fs/ext3/ialloc.c
index a3ca0238635a..e6bcf5fac48d 100644
--- a/fs/ext3/ialloc.c
+++ b/fs/ext3/ialloc.c
@@ -22,8 +22,8 @@
 #include <linux/quotaops.h>
 #include <linux/buffer_head.h>
 #include <linux/random.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/byteorder.h>
 
 #include "xattr.h"
diff --git a/fs/file.c b/fs/file.c
index d40c4028fab2..862a89c3dffe 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -12,8 +12,7 @@
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/file.h>
-
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 
 
 /*
diff --git a/fs/jfs/jfs_incore.h b/fs/jfs/jfs_incore.h
index 5496bfb149cf..2357d95c2a90 100644
--- a/fs/jfs/jfs_incore.h
+++ b/fs/jfs/jfs_incore.h
@@ -21,7 +21,7 @@
 
 #include <linux/rwsem.h>
 #include <linux/slab.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include "jfs_types.h"
 #include "jfs_xtree.h"
 #include "jfs_dtree.h"
diff --git a/fs/minix/bitmap.c b/fs/minix/bitmap.c
index daae633cc43d..4a4a74326959 100644
--- a/fs/minix/bitmap.c
+++ b/fs/minix/bitmap.c
@@ -14,7 +14,7 @@
 #include "minix.h"
 #include <linux/smp_lock.h>
 #include <linux/buffer_head.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 
 static int nibblemap[] = { 4,3,3,2,3,2,2,1,3,2,2,1,2,1,1,0 };
 
diff --git a/fs/partitions/devfs.c b/fs/partitions/devfs.c
index 9b4d03742c87..87f50444fd39 100644
--- a/fs/partitions/devfs.c
+++ b/fs/partitions/devfs.c
@@ -5,7 +5,7 @@
 #include <linux/devfs_fs_kernel.h>
 #include <linux/vmalloc.h>
 #include <linux/genhd.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/semaphore.h>
 
 
diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index 72febc00fa3b..e0e72ec5b978 100644
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -18,8 +18,8 @@
 #include <linux/init.h>
 #include <linux/idr.h>
 #include <linux/namei.h>
+#include <linux/bitops.h>
 #include <asm/uaccess.h>
-#include <asm/bitops.h>
 
 static ssize_t proc_file_read(struct file *file, char __user *buf,
 			      size_t nbytes, loff_t *ppos);
diff --git a/fs/proc/proc_tty.c b/fs/proc/proc_tty.c
index 93cbcbaf6f0c..e4e2f6b5e9c1 100644
--- a/fs/proc/proc_tty.c
+++ b/fs/proc/proc_tty.c
@@ -13,7 +13,7 @@
 #include <linux/stat.h>
 #include <linux/tty.h>
 #include <linux/seq_file.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 
 static int tty_ldiscs_read_proc(char *page, char **start, off_t off,
 				int count, int *eof, void *data);
diff --git a/fs/proc/root.c b/fs/proc/root.c
index 76779d4e5a75..aef148f099a2 100644
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -15,7 +15,7 @@
 #include <linux/config.h>
 #include <linux/init.h>
 #include <linux/module.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/smp_lock.h>
 
 struct proc_dir_entry *proc_net, *proc_net_stat, *proc_bus, *proc_root_fs, *proc_root_driver;
diff --git a/fs/qnx4/bitmap.c b/fs/qnx4/bitmap.c
index 72327856f893..ea634dc47b92 100644
--- a/fs/qnx4/bitmap.c
+++ b/fs/qnx4/bitmap.c
@@ -21,8 +21,7 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/buffer_head.h>
-
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 
 int qnx4_new_block(struct super_block *sb)
 {
diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c
index 235418f35f65..cddb733d20fb 100644
--- a/fs/udf/balloc.c
+++ b/fs/udf/balloc.c
@@ -28,7 +28,7 @@
 
 #include <linux/quotaops.h>
 #include <linux/buffer_head.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 
 #include "udf_i.h"
 #include "udf_sb.h"
diff --git a/fs/ufs/balloc.c b/fs/ufs/balloc.c
index 9195c9dfa803..997640c99c7d 100644
--- a/fs/ufs/balloc.c
+++ b/fs/ufs/balloc.c
@@ -14,7 +14,7 @@
 #include <linux/quotaops.h>
 #include <linux/buffer_head.h>
 #include <linux/sched.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/byteorder.h>
 
 #include "swab.h"
diff --git a/fs/ufs/cylinder.c b/fs/ufs/cylinder.c
index 105a695aad8f..14abb8b835f7 100644
--- a/fs/ufs/cylinder.c
+++ b/fs/ufs/cylinder.c
@@ -13,8 +13,8 @@
 #include <linux/time.h>
 #include <linux/stat.h>
 #include <linux/string.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/byteorder.h>
 
 #include "swab.h"
diff --git a/fs/ufs/ialloc.c b/fs/ufs/ialloc.c
index 767cb8fbbebf..ed6e546fc4fb 100644
--- a/fs/ufs/ialloc.c
+++ b/fs/ufs/ialloc.c
@@ -28,7 +28,7 @@
 #include <linux/quotaops.h>
 #include <linux/buffer_head.h>
 #include <linux/sched.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/byteorder.h>
 
 #include "swab.h"
diff --git a/fs/ufs/super.c b/fs/ufs/super.c
index 4ff38a0ab44a..7bcd4fc8d651 100644
--- a/fs/ufs/super.c
+++ b/fs/ufs/super.c
@@ -66,10 +66,10 @@
 
 #include <linux/config.h>
 #include <linux/module.h>
+#include <linux/bitops.h>
 
 #include <stdarg.h>
 
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
 
-- 
cgit v1.2.3