diff --git a/src/config/param.alpha_linux_24.h b/src/config/param.alpha_linux_24.h
index 24e833785a..b91fec87ee 100644
--- 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 8b914f70e3..df179cbe62 100644
--- 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 cfe86236bc..0778af09e4 100644
--- 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 037426ae03..79e846a29d 100644
--- 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 ae67b107cb..c97630022f 100644
--- 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 91e9e6c924..60146da334 100644
--- 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 5991c1eff4..e0d20f34c7 100644
--- 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 62f4f1a846..eca41dcbc1 100644
--- 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 d26a638130..24944af940 100644
--- 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 3df34e510f..03b2f5b41b 100644
--- 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 17a303b638..c5713576c7 100644
--- 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 dbb8901d40..8f909a5381 100644
--- 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 1b626e045a..50e8cc30e0 100644
--- 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 69dc6bfb9d..7f7704bde6 100644
--- 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 aa0f81eeb6..24154013ed 100644
--- 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 d1f126cd73..b44c5fa5f0 100644
--- 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 a8db50e2ad..699132df58 100644
--- 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 4d773426a9..31680bd427 100644
--- 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 108a63a601..dd71e3531a 100644
--- 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 09145962eb..a156eb5d6c 100644
--- 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 a420d5ee3e..fc049811de 100644
--- 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 bc1bed8155..8473e19f71 100644
--- 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 766ef165c3..bc1024efe8 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 */
-#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);