From: John L. <mov...@us...> - 2001-08-11 02:00:08
|
Update of /cvsroot/oprofile/oprofile In directory usw-pr-cvs1:/tmp/cvs-serv32558 Modified Files: ChangeLog oprofile.h Log Message: argh, versioning nightmare with complete_and_exit Index: ChangeLog =================================================================== RCS file: /cvsroot/oprofile/oprofile/ChangeLog,v retrieving revision 1.73 retrieving revision 1.74 diff -u -d -r1.73 -r1.74 --- ChangeLog 2001/08/11 01:45:53 1.73 +++ ChangeLog 2001/08/11 02:00:05 1.74 @@ -1,5 +1,11 @@ 2001-08-11 John Levon <mo...@co...> + * oprofile.h: 2.4.7-linus doesn't include the Andrew Morton + complete_and_exit(). Hopefully this will make it into 2.4.8, + I'm banking on this. + +2001-08-11 John Levon <mo...@co...> + * dae/op_dump: * doc/oprofile.sgml: * dae/Makefile.in: a little utility for dumping Index: oprofile.h =================================================================== RCS file: /cvsroot/oprofile/oprofile/oprofile.h,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- oprofile.h 2001/08/11 01:38:29 1.43 +++ oprofile.h 2001/08/11 02:00:05 1.44 @@ -15,9 +15,9 @@ * Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include <linux/module.h> #include <linux/config.h> #include <linux/kernel.h> -#include <linux/module.h> #include <linux/init.h> #include <linux/slab.h> #include <linux/delay.h> @@ -174,11 +174,13 @@ #endif // 2.4.7 introduced completions. -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,7) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,8) #define DECLARE_COMPLETION(x) DECLARE_MUTEX_LOCKED(x) #define init_completion(x) #define complete_and_exit(x, y) up_and_exit((x), (y)) #define wait_for_completion(x) down(x) +#else +#include <linux/completion.h> #endif int oprof_init(void); |