From ad306046291c5c67178251d349f1250fef895ae2 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Fri, 23 Apr 2010 17:10:15 +0100 Subject: [PATCH] Linux: The kernel module always runs in the kernel There's no situation where we'd be including osi_machdep.h and not be building for the kernel, so just remove the case that disables all of the locks if __KERNEL__ isn't defined. Change-Id: I1141c37cf0cd517191dee7ca2404e109d4053c29 Reviewed-on: http://gerrit.openafs.org/1821 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/afs/LINUX/osi_machdep.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/afs/LINUX/osi_machdep.h b/src/afs/LINUX/osi_machdep.h index f1dd158af..4222caf27 100644 --- a/src/afs/LINUX/osi_machdep.h +++ b/src/afs/LINUX/osi_machdep.h @@ -260,7 +260,6 @@ typedef struct uio { #define NEED_IOCTL32 #endif -#if defined(__KERNEL__) #include #include #include @@ -295,13 +294,6 @@ do { \ #define osi_InitGlock() -#else -#define AFS_GLOCK() -#define AFS_GUNLOCK() -#define ISAFS_GLOCK() 1 -#define AFS_ASSERT_GLOCK() -#endif - #ifdef AFS_AMD64_LINUX20_ENV /* RHEL5 beta's kernel doesn't define these. They aren't gonna change, so... */ -- 2.39.5