From: Chaskiel M Grundman <cg2v@andrew.cmu.edu>
Date: Sun, 20 Mar 2005 20:12:05 +0000 (+0000)
Subject: linux-rx-spinlocks-for-preempt-20050320
X-Git-Tag: openafs-devel-1_5_0~710
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=158f2d91b9e0a911494b3755768e209b12dea980;p=packages%2Fo%2Fopenafs.git

linux-rx-spinlocks-for-preempt-20050320

FIXES 17966

force linux spinlocks on when CONFIG_PREEMPT is involved
---

diff --git a/src/rx/LINUX/rx_kmutex.c b/src/rx/LINUX/rx_kmutex.c
index af7221216..a420d5ee3 100644
--- 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 b9e788633..bc1bed815 100644
--- 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 823b02232..303a58e4e 100644
--- 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);