STABLE14-linux-global-sunlock-always-20050424

ok, well, in the land of pre-emption i guess we need this always

(cherry picked from commit 3a30e787f2ab5c16bc1fdf34d74f67963ef63155)

diff --git a/src/config/param.alpha_linux_24.h b/src/config/param.alpha_linux_24.h
index 24e833785a7c63291e4c32ae83852d2cd8cfd24f..b91fec87eef39b5b47e079798d34b28b0540e017 100644 (file)
--- a/src/config/param.alpha_linux_24.h
+++ b/src/config/param.alpha_linux_24.h
@@ -44,8 +44,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.alpha_linux_26.h b/src/config/param.alpha_linux_26.h
index 8b914f70e37ce1e21d85c1f7f4cdddbd90db8465..df179cbe6250c8bf0414cc5ec29f905f9faf6d91 100644 (file)
--- a/src/config/param.alpha_linux_26.h
+++ b/src/config/param.alpha_linux_26.h
@@ -54,8 +54,8 @@
 #ifndef __SMP__
 #define __SMP__
 #endif
-#define AFS_GLOBAL_SUNLOCK
 #endif
+#define AFS_GLOBAL_SUNLOCK
 #endif /* __KERNEL__  && !DUMP_KERNEL */
 
 #include <afs/afs_sysnames.h>

diff --git a/src/config/param.amd64_linux24.h b/src/config/param.amd64_linux24.h
index cfe86236bc3a9b653b92bab05b3cb48f71e03479..0778af09e46985661d01275516978b446cb32825 100644 (file)
--- a/src/config/param.amd64_linux24.h
+++ b/src/config/param.amd64_linux24.h
@@ -55,8 +55,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.amd64_linux26.h b/src/config/param.amd64_linux26.h
index 037426ae03f0bfbec76f3e6006e9dc60194fe436..79e846a29de2e327d660f3dcb808eebbf1083f3e 100644 (file)
--- a/src/config/param.amd64_linux26.h
+++ b/src/config/param.amd64_linux26.h
@@ -49,8 +49,8 @@
 #ifndef __SMP__
 #define __SMP__
 #endif
-#define AFS_GLOBAL_SUNLOCK
 #endif
+#define AFS_GLOBAL_SUNLOCK
 
 #endif /* __KERNEL__  && !DUMP_KERNEL */
 

diff --git a/src/config/param.i386_linux24.h b/src/config/param.i386_linux24.h
index ae67b107cb000159972228da32baee50ad92b585..c97630022fc0a3c8e61904bd31d010db6c3c0384 100644 (file)
--- a/src/config/param.i386_linux24.h
+++ b/src/config/param.i386_linux24.h
@@ -44,8 +44,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_linux26.h b/src/config/param.i386_linux26.h
index 91e9e6c9244e8eaea5a991f1d55120a653a25f93..60146da334c6d4bcc609a3230afa68a8a7c83c80 100644 (file)
--- a/src/config/param.i386_linux26.h
+++ b/src/config/param.i386_linux26.h
@@ -50,8 +50,8 @@
 #ifndef __SMP__
 #define __SMP__
 #endif
-#define AFS_GLOBAL_SUNLOCK
 #endif
+#define AFS_GLOBAL_SUNLOCK
 
 #endif /* __KERNEL__  && !DUMP_KERNEL */
 

diff --git a/src/config/param.i386_umlinux24.h b/src/config/param.i386_umlinux24.h
index 5991c1eff4443259a2b1e62f0af9b02fa50da280..e0d20f34c78b4bda3c84ffe861937c4f260e833f 100644 (file)
--- a/src/config/param.i386_umlinux24.h
+++ b/src/config/param.i386_umlinux24.h
@@ -52,8 +52,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_umlinux26.h b/src/config/param.i386_umlinux26.h
index 62f4f1a8467acde151a4e1ebf6c7246efb8c49fa..eca41dcbc137c5df31653fef1f6c53d8149f0742 100644 (file)
--- a/src/config/param.i386_umlinux26.h
+++ b/src/config/param.i386_umlinux26.h
@@ -50,8 +50,8 @@
 #ifndef __SMP__
 #define __SMP__
 #endif
-#define AFS_GLOBAL_SUNLOCK
 #endif
+#define AFS_GLOBAL_SUNLOCK
 
 #endif /* __KERNEL__  && !DUMP_KERNEL */
 

diff --git a/src/config/param.ia64_linux24.h b/src/config/param.ia64_linux24.h
index d26a6381301ff6a36233020aca2553125bd9323c..24944af940518a37cc99dd4ba3d32718980e6a69 100644 (file)
--- a/src/config/param.ia64_linux24.h
+++ b/src/config/param.ia64_linux24.h
@@ -55,8 +55,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.ia64_linux26.h b/src/config/param.ia64_linux26.h
index 3df34e510f854ae0a2c629f42822a7b98d47b055..03b2f5b41b86d96d969d08ea4b22b0f4564c1acc 100644 (file)
--- a/src/config/param.ia64_linux26.h
+++ b/src/config/param.ia64_linux26.h
@@ -64,8 +64,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.parisc_linux24.h b/src/config/param.parisc_linux24.h
index 17a303b638f21c444b54ea6552077233bf917c2b..c5713576c7d3f35e96a12a8f057fb0e884d89000 100644 (file)
--- a/src/config/param.parisc_linux24.h
+++ b/src/config/param.parisc_linux24.h
@@ -39,8 +39,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.ppc64_linux24.h b/src/config/param.ppc64_linux24.h
index dbb8901d40017eb53af119bdb72fccf915bc0060..8f909a53814010dab6afa2b2032643ad33facecd 100644 (file)
--- a/src/config/param.ppc64_linux24.h
+++ b/src/config/param.ppc64_linux24.h
@@ -43,8 +43,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.ppc64_linux26.h b/src/config/param.ppc64_linux26.h
index 1b626e045ac60a27aea6732a4e76d529f3e5099a..50e8cc30e0efefcba8ca65248122ce64f37c9a36 100644 (file)
--- a/src/config/param.ppc64_linux26.h
+++ b/src/config/param.ppc64_linux26.h
@@ -49,9 +49,8 @@
 #ifndef __SMP__
 #define __SMP__
 #endif
-#define AFS_GLOBAL_SUNLOCK
 #endif
-
+#define AFS_GLOBAL_SUNLOCK
 
 #endif /* __KERNEL__  && !DUMP_KERNEL*/
 

diff --git a/src/config/param.ppc_linux24.h b/src/config/param.ppc_linux24.h
index 69dc6bfb9d84a5997c0eb13b71e18ccab4f61996..7f7704bde6e19fe68206c6588134c12c5aac1dc8 100644 (file)
--- a/src/config/param.ppc_linux24.h
+++ b/src/config/param.ppc_linux24.h
@@ -41,8 +41,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_linux26.h b/src/config/param.ppc_linux26.h
index aa0f81eeb6df1153bb71180072f64502bbf5fba4..24154013ed2ba86924d5ed899dc52960ba4964ac 100644 (file)
--- a/src/config/param.ppc_linux26.h
+++ b/src/config/param.ppc_linux26.h
@@ -47,8 +47,8 @@
 #ifndef __SMP__
 #define __SMP__
 #endif
-#define AFS_GLOBAL_SUNLOCK
 #endif
+#define AFS_GLOBAL_SUNLOCK
 
 #endif /* __KERNEL__  && !DUMP_KERNEL */
 

diff --git a/src/config/param.s390_linux24.h b/src/config/param.s390_linux24.h
index d1f126cd73aedfdb64766288db70ae5a9a069ba6..b44c5fa5f0d84070aeb4c69ef2b43bdfca5f2c48 100644 (file)
--- a/src/config/param.s390_linux24.h
+++ b/src/config/param.s390_linux24.h
@@ -54,8 +54,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.s390x_linux24.h b/src/config/param.s390x_linux24.h
index a8db50e2ad91a6119d1211ee18075aa10b970e43..699132df58f49324621c4436fa4ea1c5a13036e9 100644 (file)
--- a/src/config/param.s390x_linux24.h
+++ b/src/config/param.s390x_linux24.h
@@ -59,8 +59,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.s390x_linux26.h b/src/config/param.s390x_linux26.h
index 4d773426a941d4de3f8cf3c0bd0d211bf2221050..31680bd427bac36f30a69fe7d921c5a606f2693b 100644 (file)
--- a/src/config/param.s390x_linux26.h
+++ b/src/config/param.s390x_linux26.h
@@ -63,8 +63,8 @@
 #ifndef __SMP__
 #define __SMP__
 #endif
-#define AFS_GLOBAL_SUNLOCK
 #endif
+#define AFS_GLOBAL_SUNLOCK
 extern unsigned long __per_cpu_offset[NR_CPUS];
 extern SYSCALLTYPE sys_call_table_emu[] __attribute__((weak));
 #endif /* __KERNEL__  && !DUMP_KERNEL */

diff --git a/src/config/param.sparc64_linux24.h b/src/config/param.sparc64_linux24.h
index 108a63a601a07de3de441523266073d347042076..dd71e3531acbae2decdbada2893388e7c2bbf7f7 100644 (file)
--- a/src/config/param.sparc64_linux24.h
+++ b/src/config/param.sparc64_linux24.h
@@ -57,8 +57,8 @@
 #ifdef AFS_SMP
 #define CONFIG_SMP 1
 #define __SMP__
-#define AFS_GLOBAL_SUNLOCK
 #endif
+#define AFS_GLOBAL_SUNLOCK
 
 #endif /* __KERNEL__  && !DUMP_KERNEL */
 #include <afs/afs_sysnames.h>

diff --git a/src/config/param.sparc_linux24.h b/src/config/param.sparc_linux24.h
index 09145962eb61f241d1cf4f2c4e15b39bfb337056..a156eb5d6cae1c1b8648ccd300f4bcac748c4995 100644 (file)
--- a/src/config/param.sparc_linux24.h
+++ b/src/config/param.sparc_linux24.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/rx/LINUX/rx_kmutex.c b/src/rx/LINUX/rx_kmutex.c
index a420d5ee3eba35d8a23163fad9ea5e6872e3b496..fc049811de4968f5fc4b8fca093e799d742e4208 100644 (file)
--- a/src/rx/LINUX/rx_kmutex.c
+++ b/src/rx/LINUX/rx_kmutex.c
@@ -23,8 +23,6 @@ RCSID
 #include "rx_kmutex.h"
 #include "rx/rx_kernel.h"
 
-#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
-
 void
 afs_mutex_init(afs_kmutex_t * l)
 {
@@ -139,5 +137,3 @@ afs_cv_timedwait(afs_kcondvar_t * cv, afs_kmutex_t * l, int waittime)
        AFS_GLOCK();
     MUTEX_ENTER(l);
 }
-
-#endif

diff --git a/src/rx/LINUX/rx_kmutex.h b/src/rx/LINUX/rx_kmutex.h
index bc1bed8155543b293dbbe03067df2f741ad91d7f..8473e19f710e6101ed692f4fe1f8cd2662be7f22 100644 (file)
--- a/src/rx/LINUX/rx_kmutex.h
+++ b/src/rx/LINUX/rx_kmutex.h
@@ -24,7 +24,6 @@
 #define        AFS_GLOBAL_RXLOCK_KERNEL 1
 
 
-#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
 #define RX_ENABLE_LOCKS 1
 
 #ifndef _LINUX_CODA_FS_I
@@ -80,25 +79,4 @@ MUTEX_ISMINE(afs_kmutex_t * l)
 #define CV_BROADCAST(cv)       wake_up((struct wait_queue**)cv)
 #endif
 
-#else
-
-#define MUTEX_ISMINE(a)
-#define osirx_AssertMine(addr, msg)
-
-#define MUTEX_DESTROY(a)
-#define MUTEX_ENTER(a)
-#define MUTEX_TRYENTER(a) 1
-#define MUTEX_EXIT(a)
-#define MUTEX_INIT(a,b,c,d)
-#define CV_INIT(a,b,c,d)
-#define CV_DESTROY(a)
-#endif
-
-/* Since we're using the RX listener daemon, we don't need to hold off
- * interrupts.
- */
-#define SPLVAR
-#define NETPRI
-#define USERPRI
-
 #endif /* RX_KMUTEX_H_ */

diff --git a/src/rx/rx_prototypes.h b/src/rx/rx_prototypes.h
index 766ef165c3d1edc11f21a7f4a9322cb66a0111e9..bc1024efe82b3799b77f624f140829b1199e0d34 100644 (file)
--- a/src/rx/rx_prototypes.h
+++ b/src/rx/rx_prototypes.h
@@ -354,7 +354,7 @@ extern void osi_StopListener(void);
 
 
 /* ARCH/rx_kmutex.c */
-#if defined(KERNEL) && defined(AFS_LINUX20_ENV) && (defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)) 
+#if defined(KERNEL) && defined(AFS_LINUX20_ENV)
 extern void afs_mutex_init(afs_kmutex_t * l);
 extern void afs_mutex_enter(afs_kmutex_t * l);
 extern int afs_mutex_tryenter(afs_kmutex_t * l);