STABLE14-linux-always-glock-20050427

finish this up, always glock on linux

(cherry picked from commit c90b1bd66a8c2565a4b6927d2344768b0768c545)

diff --git a/src/afs/LINUX/osi_machdep.h b/src/afs/LINUX/osi_machdep.h
index 208dd5672f9d59de87bb854d5b1720415425fe04..707a467ada21e5c277ea1e5b0e1863cbef6fecb6 100644 (file)
--- 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 0976fed89c8788e9ddb7998cd7077a36cd365b35..48163252634f2f7b33885c3eb1ac7acf7ce3a91e 100644 (file)
--- 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 790f7a287085f4f8509fd553c99742706d55fdc7..24f3183d464267587f45bf9849d3159847fb40fd 100644 (file)
--- 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 97a22cf5b0007e3d33d0986546370d8f31476415..55c7c70f9338569e11c120077b26702e8c628c01 100644 (file)
--- 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 37a379eefd09e03f5c97fe29a16326cd99fc4204..26f3d7fe57879fe122a5e23772758fe0097d7f97 100644 (file)
--- 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 700fdca85aef82b1adc3db3de6c9eca482f78e31..c19b3997ba0fc902891d46869cbe0f77ce6369f0 100644 (file)
--- 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 3e6f4e3b10b0e348e13daa9d75f554c428eb4043..bd5547c8de4708d6d83a7237b5ea47e2edca1252 100644 (file)
--- 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 1eec93b4f4704b281674c681933c274dc6188f28..d2a2eb789c39f1f1f054c397269000de77ed2856 100644 (file)
--- 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