STABLE14-linux-rx-spinlocks-for-preempt-20050320

FIXES 17966

force linux spinlocks on when CONFIG_PREEMPT is involved

(cherry picked from commit 158f2d91b9e0a911494b3755768e209b12dea980)

diff --git a/src/rx/LINUX/rx_kmutex.c b/src/rx/LINUX/rx_kmutex.c
index af722121657807f9d8f38f82ce0334f274cece79..a420d5ee3eba35d8a23163fad9ea5e6872e3b496 100644 (file)
--- a/src/rx/LINUX/rx_kmutex.c
+++ b/src/rx/LINUX/rx_kmutex.c
@@ -23,7 +23,7 @@ RCSID
 #include "rx_kmutex.h"
 #include "rx/rx_kernel.h"
 
-#ifdef CONFIG_SMP
+#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
 
 void
 afs_mutex_init(afs_kmutex_t * l)

diff --git a/src/rx/LINUX/rx_kmutex.h b/src/rx/LINUX/rx_kmutex.h
index b9e7886337db682cd798c16fd15e9cb310ac88c4..bc1bed8155543b293dbbe03067df2f741ad91d7f 100644 (file)
--- a/src/rx/LINUX/rx_kmutex.h
+++ b/src/rx/LINUX/rx_kmutex.h
@@ -24,7 +24,7 @@
 #define        AFS_GLOBAL_RXLOCK_KERNEL 1
 
 
-#ifdef CONFIG_SMP
+#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
 #define RX_ENABLE_LOCKS 1
 
 #ifndef _LINUX_CODA_FS_I

diff --git a/src/rx/rx_prototypes.h b/src/rx/rx_prototypes.h
index 823b022324b1c5ca1e606b63647e933f3f20ddbb..303a58e4e65b960dc25731381d6c0048166041f8 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 */
-#ifdef CONFIG_SMP
+#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
 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);