From f107740d3afe02d043626a0458f63d94ad8038b8 Mon Sep 17 00:00:00 2001
From: Chaskiel M Grundman <cg2v@andrew.cmu.edu>
Date: Wed, 27 Apr 2005 22:56:12 +0000
Subject: [PATCH] STABLE14-linux-always-glock-20050427

finish this up, always glock on linux


(cherry picked from commit c90b1bd66a8c2565a4b6927d2344768b0768c545)
---
 src/afs/LINUX/osi_machdep.h        | 2 +-
 src/config/param.alpha_linux_22.h  | 2 +-
 src/config/param.i386_linux22.h    | 2 +-
 src/config/param.i386_umlinux22.h  | 2 +-
 src/config/param.ppc_linux22.h     | 2 +-
 src/config/param.s390_linux22.h    | 2 +-
 src/config/param.sparc64_linux22.h | 2 +-
 src/config/param.sparc_linux22.h   | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/afs/LINUX/osi_machdep.h b/src/afs/LINUX/osi_machdep.h
index 208dd5672f..707a467ada 100644
--- a/src/afs/LINUX/osi_machdep.h
+++ b/src/afs/LINUX/osi_machdep.h
@@ -199,7 +199,7 @@ extern unsigned long afs_linux_page_offset;
 /* function to help with the page offset stuff */
 #define afs_linux_page_address(page) (afs_linux_page_offset + PAGE_SIZE * (page - mem_map))
 
-#if defined(__KERNEL__) && defined(CONFIG_SMP)
+#if defined(__KERNEL__)
 #include "../h/sched.h"
 #include "linux/wait.h"
 
diff --git a/src/config/param.alpha_linux_22.h b/src/config/param.alpha_linux_22.h
index 0976fed89c..4816325263 100644
--- a/src/config/param.alpha_linux_22.h
+++ b/src/config/param.alpha_linux_22.h
@@ -42,8 +42,8 @@
 #ifndef __SMP__
 #define __SMP__
 #endif
-#define AFS_GLOBAL_SUNLOCK
 #endif
+#define AFS_GLOBAL_SUNLOCK
 #if defined(MODULE) && defined(CONFIG_MODVERSIONS)
 #define MODVERSIONS
 #include <linux/modversions.h>
diff --git a/src/config/param.i386_linux22.h b/src/config/param.i386_linux22.h
index 790f7a2870..24f3183d46 100644
--- a/src/config/param.i386_linux22.h
+++ b/src/config/param.i386_linux22.h
@@ -47,8 +47,8 @@
 #ifndef __SMP__
 #define __SMP__
 #endif
-#define AFS_GLOBAL_SUNLOCK
 #endif
+#define AFS_GLOBAL_SUNLOCK
 
 #if defined(MODULE) && defined(CONFIG_MODVERSIONS)
 #define MODVERSIONS
diff --git a/src/config/param.i386_umlinux22.h b/src/config/param.i386_umlinux22.h
index 97a22cf5b0..55c7c70f93 100644
--- a/src/config/param.i386_umlinux22.h
+++ b/src/config/param.i386_umlinux22.h
@@ -49,8 +49,8 @@
 #ifndef __SMP__
 #define __SMP__
 #endif
-#define AFS_GLOBAL_SUNLOCK
 #endif
+#define AFS_GLOBAL_SUNLOCK
 
 #if defined(MODULE) && defined(CONFIG_MODVERSIONS)
 #define MODVERSIONS
diff --git a/src/config/param.ppc_linux22.h b/src/config/param.ppc_linux22.h
index 37a379eefd..26f3d7fe57 100644
--- a/src/config/param.ppc_linux22.h
+++ b/src/config/param.ppc_linux22.h
@@ -35,8 +35,8 @@
 #ifndef __SMP__
 #define __SMP__
 #endif
-#define AFS_GLOBAL_SUNLOCK
 #endif
+#define AFS_GLOBAL_SUNLOCK
 
 #if defined(MODULE) && defined(CONFIG_MODVERSIONS)
 #define MODVERSIONS
diff --git a/src/config/param.s390_linux22.h b/src/config/param.s390_linux22.h
index 700fdca85a..c19b3997ba 100644
--- a/src/config/param.s390_linux22.h
+++ b/src/config/param.s390_linux22.h
@@ -48,8 +48,8 @@
 #ifndef __SMP__
 #define __SMP__
 #endif
-#define AFS_GLOBAL_SUNLOCK
 #endif
+#define AFS_GLOBAL_SUNLOCK
 
 #if defined(MODULE) && defined(CONFIG_MODVERSIONS)
 #define MODVERSIONS
diff --git a/src/config/param.sparc64_linux22.h b/src/config/param.sparc64_linux22.h
index 3e6f4e3b10..bd5547c8de 100644
--- a/src/config/param.sparc64_linux22.h
+++ b/src/config/param.sparc64_linux22.h
@@ -50,8 +50,8 @@
 #ifndef __SMP__
 #define __SMP__
 #endif
-#define AFS_GLOBAL_SUNLOCK
 #endif
+#define AFS_GLOBAL_SUNLOCK
 
 #if defined(MODULE) && defined(CONFIG_MODVERSIONS)
 #define MODVERSIONS
diff --git a/src/config/param.sparc_linux22.h b/src/config/param.sparc_linux22.h
index 1eec93b4f4..d2a2eb789c 100644
--- a/src/config/param.sparc_linux22.h
+++ b/src/config/param.sparc_linux22.h
@@ -45,8 +45,8 @@
 #ifndef __SMP__
 #define __SMP__
 #endif
-#define AFS_GLOBAL_SUNLOCK
 #endif
+#define AFS_GLOBAL_SUNLOCK
 
 #if defined(MODULE) && defined(CONFIG_MODVERSIONS)
 #define MODVERSIONS