From: John L. <mov...@us...> - 2001-11-06 09:07:44
|
Update of /cvsroot/oprofile/oprofile/module In directory usw-pr-cvs1:/tmp/cvs-serv22161/module Modified Files: oprofile.c oprofile.h Log Message: allow_unload on UP Index: oprofile.c =================================================================== RCS file: /cvsroot/oprofile/oprofile/module/oprofile.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- oprofile.c 2001/11/05 16:10:20 1.6 +++ oprofile.c 2001/11/06 02:05:49 1.7 @@ -24,10 +24,12 @@ MODULE_DESCRIPTION("Continuous Profiling Module"); MODULE_LICENSE("GPL"); -#ifdef CONFIG_SMP MODULE_PARM(allow_unload, "i"); -MODULE_PARM_DESC(allow_unload, "Allow module to be unloaded on SMP"); +MODULE_PARM_DESC(allow_unload, "Allow module to be unloaded."); +#ifdef CONFIG_SMP static int allow_unload; +#else +static int allow_unload = 1; #endif /* sysctl settables */ @@ -958,7 +960,7 @@ int can = -EBUSY; down(&sysctlsem); - if (smp_can_unload() && !prof_on && !GET_USE_COUNT(THIS_MODULE)) + if (allow_unload && !prof_on && !GET_USE_COUNT(THIS_MODULE)) can = 0; up(&sysctlsem); return can; Index: oprofile.h =================================================================== RCS file: /cvsroot/oprofile/oprofile/module/oprofile.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- oprofile.h 2001/11/04 12:19:04 1.4 +++ oprofile.h 2001/11/06 02:05:49 1.5 @@ -220,13 +220,6 @@ #endif #endif -/* we can't unload safely on SMP */ -#ifdef CONFIG_SMP -#define smp_can_unload() (allow_unload) -#else -#define smp_can_unload() 1 -#endif - // 2.4.3 introduced rw mmap semaphore #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,3) #define take_mmap_sem(mm) down(&mm->mmap_sem) |