From 3a30e787f2ab5c16bc1fdf34d74f67963ef63155 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Mon, 25 Apr 2005 18:20:16 +0000 Subject: [PATCH] linux-global-sunlock-always-20050424 ok, well, in the land of pre-emption i guess we need this always --- src/config/param.alpha_linux_24.h | 2 +- src/config/param.alpha_linux_26.h | 2 +- src/config/param.amd64_linux24.h | 2 +- src/config/param.amd64_linux26.h | 2 +- src/config/param.i386_linux24.h | 2 +- src/config/param.i386_linux26.h | 2 +- src/config/param.i386_umlinux24.h | 2 +- src/config/param.i386_umlinux26.h | 2 +- src/config/param.ia64_linux24.h | 2 +- src/config/param.ia64_linux26.h | 2 +- src/config/param.parisc_linux24.h | 2 +- src/config/param.ppc64_linux24.h | 2 +- src/config/param.ppc64_linux26.h | 3 +-- src/config/param.ppc_linux24.h | 2 +- src/config/param.ppc_linux26.h | 2 +- src/config/param.s390_linux24.h | 2 +- src/config/param.s390x_linux24.h | 2 +- src/config/param.s390x_linux26.h | 2 +- src/config/param.sparc64_linux24.h | 2 +- src/config/param.sparc_linux24.h | 2 +- src/rx/LINUX/rx_kmutex.c | 4 ---- src/rx/LINUX/rx_kmutex.h | 22 ---------------------- src/rx/rx_prototypes.h | 2 +- 23 files changed, 21 insertions(+), 48 deletions(-) diff --git a/src/config/param.alpha_linux_24.h b/src/config/param.alpha_linux_24.h index 24e8337..b91fec8 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 diff --git a/src/config/param.alpha_linux_26.h b/src/config/param.alpha_linux_26.h index 8b914f7..df179cb 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 diff --git a/src/config/param.amd64_linux24.h b/src/config/param.amd64_linux24.h index cfe8623..0778af0 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 037426a..79e846a 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 ae67b10..c976300 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 91e9e6c..60146da 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 5991c1e..e0d20f3 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 62f4f1a..eca41dc 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 d26a638..24944af 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 3df34e5..03b2f5b 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 17a303b..c571357 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 dbb8901..8f909a5 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 1b626e0..50e8cc3 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 69dc6bf..7f7704b 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 aa0f81e..2415401 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 d1f126c..b44c5fa 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 diff --git a/src/config/param.s390x_linux24.h b/src/config/param.s390x_linux24.h index a8db50e..699132d 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 diff --git a/src/config/param.s390x_linux26.h b/src/config/param.s390x_linux26.h index 4d77342..31680bd 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 108a63a..dd71e35 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 diff --git a/src/config/param.sparc_linux24.h b/src/config/param.sparc_linux24.h index 0914596..a156eb5 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 a420d5e..fc04981 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 bc1bed8..8473e19 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 766ef16..bc1024e 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); -- 1.9.4