jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-02-01 14:07:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

STABLE14-linux-global-sunlock-always-20050424

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


(cherry picked from commit 3a30e787f2ab5c16bc1fdf34d74f67963ef63155)
This commit is contained in:
Derrick Brashear 2005-04-25 18:20:00 +00:00
parent 4d9319bdc5
commit f61c7f0972
23 changed files with 21 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config/param.alpha_linux_24.h
View File

@ -44,8 +44,8 @@
#ifndef __SMP__ #ifndef __SMP__
#define __SMP__ #define __SMP__
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#if defined(MODULE) && defined(CONFIG_MODVERSIONS) #if defined(MODULE) && defined(CONFIG_MODVERSIONS)
#define MODVERSIONS #define MODVERSIONS
#include <linux/modversions.h> #include <linux/modversions.h>

2
src/config/param.alpha_linux_26.h
View File

@ -54,8 +54,8 @@
#ifndef __SMP__ #ifndef __SMP__
#define __SMP__ #define __SMP__
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#endif /* __KERNEL__ && !DUMP_KERNEL */ #endif /* __KERNEL__ && !DUMP_KERNEL */
#include <afs/afs_sysnames.h> #include <afs/afs_sysnames.h>

2
src/config/param.amd64_linux24.h
View File

@ -55,8 +55,8 @@
#ifndef __SMP__ #ifndef __SMP__
#define __SMP__ #define __SMP__
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#if defined(MODULE) && defined(CONFIG_MODVERSIONS) #if defined(MODULE) && defined(CONFIG_MODVERSIONS)
#define MODVERSIONS #define MODVERSIONS

2
src/config/param.amd64_linux26.h
View File

@ -49,8 +49,8 @@
#ifndef __SMP__ #ifndef __SMP__
#define __SMP__ #define __SMP__
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#endif /* __KERNEL__ && !DUMP_KERNEL */ #endif /* __KERNEL__ && !DUMP_KERNEL */

2
src/config/param.i386_linux24.h
View File

@ -44,8 +44,8 @@
#ifndef __SMP__ #ifndef __SMP__
#define __SMP__ #define __SMP__
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#if defined(MODULE) && defined(CONFIG_MODVERSIONS) #if defined(MODULE) && defined(CONFIG_MODVERSIONS)
#define MODVERSIONS #define MODVERSIONS

2
src/config/param.i386_linux26.h
View File

@ -50,8 +50,8 @@
#ifndef __SMP__ #ifndef __SMP__
#define __SMP__ #define __SMP__
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#endif /* __KERNEL__ && !DUMP_KERNEL */ #endif /* __KERNEL__ && !DUMP_KERNEL */

2
src/config/param.i386_umlinux24.h
View File

@ -52,8 +52,8 @@
#ifndef __SMP__ #ifndef __SMP__
#define __SMP__ #define __SMP__
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#if defined(MODULE) && defined(CONFIG_MODVERSIONS) #if defined(MODULE) && defined(CONFIG_MODVERSIONS)
#define MODVERSIONS #define MODVERSIONS

2
src/config/param.i386_umlinux26.h
View File

@ -50,8 +50,8 @@
#ifndef __SMP__ #ifndef __SMP__
#define __SMP__ #define __SMP__
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#endif /* __KERNEL__ && !DUMP_KERNEL */ #endif /* __KERNEL__ && !DUMP_KERNEL */

2
src/config/param.ia64_linux24.h
View File

@ -55,8 +55,8 @@
#ifndef __SMP__ #ifndef __SMP__
#define __SMP__ #define __SMP__
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#if defined(MODULE) && defined(CONFIG_MODVERSIONS) #if defined(MODULE) && defined(CONFIG_MODVERSIONS)
#define MODVERSIONS #define MODVERSIONS

2
src/config/param.ia64_linux26.h
View File

@ -64,8 +64,8 @@
#ifndef __SMP__ #ifndef __SMP__
#define __SMP__ #define __SMP__
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#if defined(MODULE) && defined(CONFIG_MODVERSIONS) #if defined(MODULE) && defined(CONFIG_MODVERSIONS)
#define MODVERSIONS #define MODVERSIONS

2
src/config/param.parisc_linux24.h
View File

@ -39,8 +39,8 @@
#ifndef __SMP__ #ifndef __SMP__
#define __SMP__ #define __SMP__
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#if defined(MODULE) && defined(CONFIG_MODVERSIONS) #if defined(MODULE) && defined(CONFIG_MODVERSIONS)
#define MODVERSIONS #define MODVERSIONS

2
src/config/param.ppc64_linux24.h
View File

@ -43,8 +43,8 @@
#ifndef __SMP__ #ifndef __SMP__
#define __SMP__ #define __SMP__
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#if defined(MODULE) && defined(CONFIG_MODVERSIONS) #if defined(MODULE) && defined(CONFIG_MODVERSIONS)
#define MODVERSIONS #define MODVERSIONS

3
src/config/param.ppc64_linux26.h
View File

@ -49,9 +49,8 @@
#ifndef __SMP__ #ifndef __SMP__
#define __SMP__ #define __SMP__
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#endif /* __KERNEL__ && !DUMP_KERNEL*/ #endif /* __KERNEL__ && !DUMP_KERNEL*/

2
src/config/param.ppc_linux24.h
View File

@ -41,8 +41,8 @@
#ifndef __SMP__ #ifndef __SMP__
#define __SMP__ #define __SMP__
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#if defined(MODULE) && defined(CONFIG_MODVERSIONS) #if defined(MODULE) && defined(CONFIG_MODVERSIONS)
#define MODVERSIONS #define MODVERSIONS

2
src/config/param.ppc_linux26.h
View File

@ -47,8 +47,8 @@
#ifndef __SMP__ #ifndef __SMP__
#define __SMP__ #define __SMP__
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#endif /* __KERNEL__ && !DUMP_KERNEL */ #endif /* __KERNEL__ && !DUMP_KERNEL */

2
src/config/param.s390_linux24.h
View File

@ -54,8 +54,8 @@
#ifndef __SMP__ #ifndef __SMP__
#define __SMP__ #define __SMP__
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#if defined(MODULE) && defined(CONFIG_MODVERSIONS) #if defined(MODULE) && defined(CONFIG_MODVERSIONS)
#define MODVERSIONS #define MODVERSIONS
#include <linux/modversions.h> #include <linux/modversions.h>

2
src/config/param.s390x_linux24.h
View File

@ -59,8 +59,8 @@
#ifndef __SMP__ #ifndef __SMP__
#define __SMP__ #define __SMP__
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#if defined(MODULE) && defined(CONFIG_MODVERSIONS) #if defined(MODULE) && defined(CONFIG_MODVERSIONS)
#define MODVERSIONS #define MODVERSIONS
#include <linux/modversions.h> #include <linux/modversions.h>

2
src/config/param.s390x_linux26.h
View File

@ -63,8 +63,8 @@
#ifndef __SMP__ #ifndef __SMP__
#define __SMP__ #define __SMP__
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#endif #endif
#define AFS_GLOBAL_SUNLOCK
extern unsigned long __per_cpu_offset[NR_CPUS]; extern unsigned long __per_cpu_offset[NR_CPUS];
extern SYSCALLTYPE sys_call_table_emu[] __attribute__((weak)); extern SYSCALLTYPE sys_call_table_emu[] __attribute__((weak));
#endif /* __KERNEL__ && !DUMP_KERNEL */ #endif /* __KERNEL__ && !DUMP_KERNEL */

2
src/config/param.sparc64_linux24.h
View File

@ -57,8 +57,8 @@
#ifdef AFS_SMP #ifdef AFS_SMP
#define CONFIG_SMP 1 #define CONFIG_SMP 1
#define __SMP__ #define __SMP__
#define AFS_GLOBAL_SUNLOCK
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#endif /* __KERNEL__ && !DUMP_KERNEL */ #endif /* __KERNEL__ && !DUMP_KERNEL */
#include <afs/afs_sysnames.h> #include <afs/afs_sysnames.h>

2
src/config/param.sparc_linux24.h
View File

@ -50,8 +50,8 @@
#ifndef __SMP__ #ifndef __SMP__
#define __SMP__ #define __SMP__
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#endif #endif
#define AFS_GLOBAL_SUNLOCK
#if defined(MODULE) && defined(CONFIG_MODVERSIONS) #if defined(MODULE) && defined(CONFIG_MODVERSIONS)
#define MODVERSIONS #define MODVERSIONS

4
src/rx/LINUX/rx_kmutex.c
View File

@ -23,8 +23,6 @@ RCSID
#include "rx_kmutex.h" #include "rx_kmutex.h"
#include "rx/rx_kernel.h" #include "rx/rx_kernel.h"
#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
void void
afs_mutex_init(afs_kmutex_t * l) 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(); AFS_GLOCK();
MUTEX_ENTER(l); MUTEX_ENTER(l);
} }
#endif

22
src/rx/LINUX/rx_kmutex.h
View File

@ -24,7 +24,6 @@
#define AFS_GLOBAL_RXLOCK_KERNEL 1 #define AFS_GLOBAL_RXLOCK_KERNEL 1
#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
#define RX_ENABLE_LOCKS 1 #define RX_ENABLE_LOCKS 1
#ifndef _LINUX_CODA_FS_I #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) #define CV_BROADCAST(cv) wake_up((struct wait_queue**)cv)
#endif #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_ */ #endif /* RX_KMUTEX_H_ */

2
src/rx/rx_prototypes.h
View File

@ -354,7 +354,7 @@ extern void osi_StopListener(void);
/* ARCH/rx_kmutex.c */ /* 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_init(afs_kmutex_t * l);
extern void afs_mutex_enter(afs_kmutex_t * l); extern void afs_mutex_enter(afs_kmutex_t * l);
extern int afs_mutex_tryenter(afs_kmutex_t * l); extern int afs_mutex_tryenter(afs_kmutex_t * l);