diff --git a/fs/gfs2/acl.c b/fs/gfs2/acl.c
index e9d05fe9435728c0a8a3075a94ebbc9c325e86ce..d822256c7a53bd1635da2caa7ff18e86bb69061a 100644
--- a/fs/gfs2/acl.c
+++ b/fs/gfs2/acl.c
@@ -14,7 +14,6 @@
 #include <linux/buffer_head.h>
 #include <linux/posix_acl.h>
 #include <linux/posix_acl_xattr.h>
-#include <asm/semaphore.h>
 #include <linux/gfs2_ondisk.h>
 
 #include "gfs2.h"
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index 31c3e92820e4ea75ad3aeec2604d849ad7049191..32b1d66e68e16e0d896fef0099410befe7dc9d38 100644
--- a/fs/gfs2/bmap.c
+++ b/fs/gfs2/bmap.c
@@ -14,7 +14,6 @@
 #include <linux/buffer_head.h>
 #include <linux/gfs2_ondisk.h>
 #include <linux/crc32.h>
-#include <asm/semaphore.h>
 
 #include "gfs2.h"
 #include "lm_interface.h"
diff --git a/fs/gfs2/daemon.c b/fs/gfs2/daemon.c
index c2b5d69044c61abdbfc24c5a2ead0077c6066e8e..aa4d13002bb45b1f0888e9f8205935631a8d1ed4 100644
--- a/fs/gfs2/daemon.c
+++ b/fs/gfs2/daemon.c
@@ -15,7 +15,6 @@
 #include <linux/kthread.h>
 #include <linux/delay.h>
 #include <linux/gfs2_ondisk.h>
-#include <asm/semaphore.h>
 
 #include "gfs2.h"
 #include "lm_interface.h"
diff --git a/fs/gfs2/eaops.c b/fs/gfs2/eaops.c
index 1b376eceb6af5273a7f963dd19ef96571f7b5035..e5e2565ac2923081fca4892c5618758dff6e6aea 100644
--- a/fs/gfs2/eaops.c
+++ b/fs/gfs2/eaops.c
@@ -14,7 +14,6 @@
 #include <linux/buffer_head.h>
 #include <linux/xattr.h>
 #include <linux/gfs2_ondisk.h>
-#include <asm/semaphore.h>
 #include <asm/uaccess.h>
 
 #include "gfs2.h"
diff --git a/fs/gfs2/eattr.c b/fs/gfs2/eattr.c
index af4f1c3f5929b8f727d71cfd48280ec95dd2c17a..3930304bc511ea5ebd7e276dcaee6ec67fd85980 100644
--- a/fs/gfs2/eattr.c
+++ b/fs/gfs2/eattr.c
@@ -14,7 +14,6 @@
 #include <linux/buffer_head.h>
 #include <linux/xattr.h>
 #include <linux/gfs2_ondisk.h>
-#include <asm/semaphore.h>
 #include <asm/uaccess.h>
 
 #include "gfs2.h"
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 9d4ae094fa2d7b3f206eb373e6b30bc77d386432..2029df4b349f90df66028b39c029eee49e722601 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -18,7 +18,6 @@
 #include <linux/kref.h>
 #include <linux/kallsyms.h>
 #include <linux/gfs2_ondisk.h>
-#include <asm/semaphore.h>
 #include <asm/uaccess.h>
 
 #include "gfs2.h"
diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
index d180c89dd567340725c7095d33701fb26a34435b..5e8ec6a618242bbcb372ba093c3ef7473efebba2 100644
--- a/fs/gfs2/glops.c
+++ b/fs/gfs2/glops.c
@@ -13,7 +13,6 @@
 #include <linux/completion.h>
 #include <linux/buffer_head.h>
 #include <linux/gfs2_ondisk.h>
-#include <asm/semaphore.h>
 
 #include "gfs2.h"
 #include "lm_interface.h"
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 5bc9542c7fcb9cbf4ed62982f6e70b4df025b80d..d218cbf98aa73eaff2382ba0ce8ae0339fbceff1 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -16,7 +16,6 @@
 #include <linux/sort.h>
 #include <linux/gfs2_ondisk.h>
 #include <linux/crc32.h>
-#include <asm/semaphore.h>
 
 #include "gfs2.h"
 #include "lm_interface.h"
diff --git a/fs/gfs2/lm.c b/fs/gfs2/lm.c
index 06a785e9b5822965e2ec8d6e32a0cbcfa76377fa..600b2bc48ba9e809f4b3adfc302dc372f10cfe8f 100644
--- a/fs/gfs2/lm.c
+++ b/fs/gfs2/lm.c
@@ -14,7 +14,6 @@
 #include <linux/buffer_head.h>
 #include <linux/delay.h>
 #include <linux/gfs2_ondisk.h>
-#include <asm/semaphore.h>
 
 #include "gfs2.h"
 #include "lm_interface.h"
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
index 02d31e35f0cab822246967fad74cbc063fea8cd0..0e5e9cf9dd466c9ed5e44e8726bc374232cfa637 100644
--- a/fs/gfs2/log.c
+++ b/fs/gfs2/log.c
@@ -14,7 +14,6 @@
 #include <linux/buffer_head.h>
 #include <linux/gfs2_ondisk.h>
 #include <linux/crc32.h>
-#include <asm/semaphore.h>
 
 #include "gfs2.h"
 #include "lm_interface.h"
diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index 4d90eb3114977372e45f855c3c7cb9119dcee02c..22a4f038e3b9eb497fa600566d7d58952bac2829 100644
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -13,7 +13,6 @@
 #include <linux/completion.h>
 #include <linux/buffer_head.h>
 #include <linux/gfs2_ondisk.h>
-#include <asm/semaphore.h>
 
 #include "gfs2.h"
 #include "lm_interface.h"
diff --git a/fs/gfs2/lvb.c b/fs/gfs2/lvb.c
index 47867db92ea1a13743a44b2a09b9535c764830de..a56b23e0a3f111474922d1c329d7df2b99167e92 100644
--- a/fs/gfs2/lvb.c
+++ b/fs/gfs2/lvb.c
@@ -13,7 +13,6 @@
 #include <linux/completion.h>
 #include <linux/buffer_head.h>
 #include <linux/gfs2_ondisk.h>
-#include <asm/semaphore.h>
 
 #include "gfs2.h"
 #include "lm_interface.h"
diff --git a/fs/gfs2/main.c b/fs/gfs2/main.c
index c8d17b7ba60b264a7ace5ebc98f54a7d7efad92b..b0a4582e78db0c4d28bd8fe53aef982c8167e37c 100644
--- a/fs/gfs2/main.c
+++ b/fs/gfs2/main.c
@@ -15,7 +15,6 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/gfs2_ondisk.h>
-#include <asm/semaphore.h>
 
 #include "gfs2.h"
 #include "lm_interface.h"
diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c
index fe46d563d3c8f2fa110ca2f65d9b6d3d4faf1905..92c1a3f823d8a315a66ad439be6a4843f4ce0478 100644
--- a/fs/gfs2/meta_io.c
+++ b/fs/gfs2/meta_io.c
@@ -18,7 +18,6 @@
 #include <linux/swap.h>
 #include <linux/delay.h>
 #include <linux/gfs2_ondisk.h>
-#include <asm/semaphore.h>
 
 #include "gfs2.h"
 #include "lm_interface.h"
diff --git a/fs/gfs2/mount.c b/fs/gfs2/mount.c
index e90ea7d32f9ec1181464a2b82c63c910f94c85c7..7e001356824e14bcf43d2717aa85ac2cf1730ebf 100644
--- a/fs/gfs2/mount.c
+++ b/fs/gfs2/mount.c
@@ -13,7 +13,6 @@
 #include <linux/completion.h>
 #include <linux/buffer_head.h>
 #include <linux/gfs2_ondisk.h>
-#include <asm/semaphore.h>
 
 #include "gfs2.h"
 #include "lm_interface.h"
diff --git a/fs/gfs2/ondisk.c b/fs/gfs2/ondisk.c
index f6aba3b156c29619501eab4122a9ce5b6d7f3013..90d398d2d0478a6a2c6e9d6f5573a5b0b34edc8e 100644
--- a/fs/gfs2/ondisk.c
+++ b/fs/gfs2/ondisk.c
@@ -12,7 +12,6 @@
 #include <linux/spinlock.h>
 #include <linux/completion.h>
 #include <linux/buffer_head.h>
-#include <asm/semaphore.h>
 
 #include "gfs2.h"
 #include <linux/gfs2_ondisk.h>
diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c
index d89179b316fe82161aa5d74b30763a27dde5f231..6d2fc107bbd31caa630049f396a64aa340fc8a88 100644
--- a/fs/gfs2/ops_address.c
+++ b/fs/gfs2/ops_address.c
@@ -17,7 +17,6 @@
 #include <linux/mpage.h>
 #include <linux/fs.h>
 #include <linux/gfs2_ondisk.h>
-#include <asm/semaphore.h>
 
 #include "gfs2.h"
 #include "lm_interface.h"
diff --git a/fs/gfs2/ops_dentry.c b/fs/gfs2/ops_dentry.c
index 9583710760936e4b807ad1633512f5bba6112e62..6cbff891063effe184cd1a45eeb86bdba7110e90 100644
--- a/fs/gfs2/ops_dentry.c
+++ b/fs/gfs2/ops_dentry.c
@@ -15,7 +15,6 @@
 #include <linux/smp_lock.h>
 #include <linux/gfs2_ondisk.h>
 #include <linux/crc32.h>
-#include <asm/semaphore.h>
 
 #include "gfs2.h"
 #include "lm_interface.h"
diff --git a/fs/gfs2/ops_export.c b/fs/gfs2/ops_export.c
index be16c68263d1f081031d036635e529d5636fd96d..a90397f28196975e2a4fb3ad6afc966553d57576 100644
--- a/fs/gfs2/ops_export.c
+++ b/fs/gfs2/ops_export.c
@@ -14,7 +14,6 @@
 #include <linux/buffer_head.h>
 #include <linux/gfs2_ondisk.h>
 #include <linux/crc32.h>
-#include <asm/semaphore.h>
 
 #include "gfs2.h"
 #include "lm_interface.h"
diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c
index cf724800e0e9338f4640b27352f110da43eadea5..00522fc927cdd745809d95dc83da117d6c321aab 100644
--- a/fs/gfs2/ops_file.c
+++ b/fs/gfs2/ops_file.c
@@ -22,7 +22,6 @@
 #include <linux/ext2_fs.h>
 #include <linux/crc32.h>
 #include <linux/iflags.h>
-#include <asm/semaphore.h>
 #include <asm/uaccess.h>
 
 #include "gfs2.h"
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index 44c64effc964d950867543958118bde8bc2d7246..5899ac33451c46d01c193bf59641cea2fcb26e9a 100644
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -16,7 +16,6 @@
 #include <linux/blkdev.h>
 #include <linux/kthread.h>
 #include <linux/gfs2_ondisk.h>
-#include <asm/semaphore.h>
 
 #include "gfs2.h"
 #include "lm_interface.h"
diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c
index b25ec4c8e56a802b4af7f4143a995cbea15ef6ba..c8aeaafec50f678fa4ba1793a22444ebb45d92dc 100644
--- a/fs/gfs2/ops_inode.c
+++ b/fs/gfs2/ops_inode.c
@@ -19,7 +19,6 @@
 #include <linux/posix_acl.h>
 #include <linux/gfs2_ondisk.h>
 #include <linux/crc32.h>
-#include <asm/semaphore.h>
 #include <asm/uaccess.h>
 
 #include "gfs2.h"
diff --git a/fs/gfs2/ops_super.c b/fs/gfs2/ops_super.c
index 5910c7b5c846c4c40013e7dfa653d4732b80c205..3661b2f25b8fb0597e168234b0d810e3272b76ea 100644
--- a/fs/gfs2/ops_super.c
+++ b/fs/gfs2/ops_super.c
@@ -19,7 +19,6 @@
 #include <linux/kthread.h>
 #include <linux/delay.h>
 #include <linux/gfs2_ondisk.h>
-#include <asm/semaphore.h>
 
 #include "gfs2.h"
 #include "lm_interface.h"
diff --git a/fs/gfs2/ops_vm.c b/fs/gfs2/ops_vm.c
index d67248cae9b9adca0f0de25cb2c3b6f55c6498a6..23161be5db1f9400f8b64d9c56596f4795343f95 100644
--- a/fs/gfs2/ops_vm.c
+++ b/fs/gfs2/ops_vm.c
@@ -15,7 +15,6 @@
 #include <linux/mm.h>
 #include <linux/pagemap.h>
 #include <linux/gfs2_ondisk.h>
-#include <asm/semaphore.h>
 
 #include "gfs2.h"
 #include "lm_interface.h"
diff --git a/fs/gfs2/page.c b/fs/gfs2/page.c
index 495db559416484b13253b04973f50e78582e438c..bc80247060f403d3d70e30ab956771a1197a8637 100644
--- a/fs/gfs2/page.c
+++ b/fs/gfs2/page.c
@@ -15,7 +15,6 @@
 #include <linux/pagemap.h>
 #include <linux/mm.h>
 #include <linux/gfs2_ondisk.h>
-#include <asm/semaphore.h>
 
 #include "gfs2.h"
 #include "lm_interface.h"
diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index d49ff43b3a862b6c498e4006b3a12c6c46a283aa..adfb8062f5de14356f37c718c9919dfed469afdc 100644
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -45,7 +45,6 @@
 #include <linux/sort.h>
 #include <linux/fs.h>
 #include <linux/gfs2_ondisk.h>
-#include <asm/semaphore.h>
 
 #include "gfs2.h"
 #include "lm_interface.h"
diff --git a/fs/gfs2/recovery.c b/fs/gfs2/recovery.c
index 87adebea3bc39b7b4c5de0074e0c38304e8abe3d..527544b68a6f9e6fb63d25ba87bb60d0f8f042ab 100644
--- a/fs/gfs2/recovery.c
+++ b/fs/gfs2/recovery.c
@@ -14,7 +14,6 @@
 #include <linux/buffer_head.h>
 #include <linux/gfs2_ondisk.h>
 #include <linux/crc32.h>
-#include <asm/semaphore.h>
 
 #include "gfs2.h"
 #include "lm_interface.h"
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index 6d918a7c622272eb6813a7438c87ad774543c581..1b1a2aee8f6ba5562762d81885b16d073490b258 100644
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -14,7 +14,6 @@
 #include <linux/buffer_head.h>
 #include <linux/fs.h>
 #include <linux/gfs2_ondisk.h>
-#include <asm/semaphore.h>
 
 #include "gfs2.h"
 #include "lm_interface.h"
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index 75a8def8d0bc93267f320f24e887f28abd033de6..788dbea45c8706da3b731110da0c329b030dfcf1 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -14,7 +14,6 @@
 #include <linux/buffer_head.h>
 #include <linux/crc32.h>
 #include <linux/gfs2_ondisk.h>
-#include <asm/semaphore.h>
 
 #include "gfs2.h"
 #include "lm_interface.h"
diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c
index f05ba8f69132850a3d20ea9c59afb9290d7a14a1..bbfa9e16abc33a73767f87405bb1793fc07bf572 100644
--- a/fs/gfs2/sys.c
+++ b/fs/gfs2/sys.c
@@ -15,7 +15,6 @@
 #include <linux/module.h>
 #include <linux/kobject.h>
 #include <linux/gfs2_ondisk.h>
-#include <asm/semaphore.h>
 #include <asm/uaccess.h>
 
 #include "gfs2.h"
diff --git a/fs/gfs2/trans.c b/fs/gfs2/trans.c
index 18c606d071265323e223e4c981d0e143d5b6bae9..a4c414c593517d65730177965ef673702c6b441e 100644
--- a/fs/gfs2/trans.c
+++ b/fs/gfs2/trans.c
@@ -14,7 +14,6 @@
 #include <linux/buffer_head.h>
 #include <linux/gfs2_ondisk.h>
 #include <linux/kallsyms.h>
-#include <asm/semaphore.h>
 
 #include "gfs2.h"
 #include "lm_interface.h"
diff --git a/fs/gfs2/unlinked.c b/fs/gfs2/unlinked.c
index 2824b1665f95fbf0d6267207a005c73b4a0f7fb6..9ed0a6b8fc639e391b18906b6112001667c92ca0 100644
--- a/fs/gfs2/unlinked.c
+++ b/fs/gfs2/unlinked.c
@@ -14,7 +14,6 @@
 #include <linux/buffer_head.h>
 #include <linux/kthread.h>
 #include <linux/gfs2_ondisk.h>
-#include <asm/semaphore.h>
 
 #include "gfs2.h"
 #include "lm_interface.h"
diff --git a/fs/gfs2/util.c b/fs/gfs2/util.c
index 7cd9e25639c4fa202adcb2de0466d78e80c13b40..7c3806c674064cd5669e1645ade0a3fe8f52966b 100644
--- a/fs/gfs2/util.c
+++ b/fs/gfs2/util.c
@@ -14,7 +14,6 @@
 #include <linux/buffer_head.h>
 #include <linux/crc32.h>
 #include <linux/gfs2_ondisk.h>
-#include <asm/semaphore.h>
 #include <asm/uaccess.h>
 
 #include "gfs2.h"