From: John L. <mov...@us...> - 2001-10-16 15:56:50
|
Update of /cvsroot/oprofile/oprofile In directory usw-pr-cvs1:/tmp/cvs-serv23382 Modified Files: ChangeLog oprofile.h Log Message: fix for likely()/unlikely() Index: ChangeLog =================================================================== RCS file: /cvsroot/oprofile/oprofile/ChangeLog,v retrieving revision 1.188 retrieving revision 1.189 diff -u -d -r1.188 -r1.189 --- ChangeLog 2001/10/14 19:35:13 1.188 +++ ChangeLog 2001/10/16 15:56:45 1.189 @@ -1,3 +1,7 @@ +2001-10-16 John Levon <mo...@co...> + + * oprofile.h: fix likely() macro + 2001-10-14 John Levon <mo...@co...> * TODO: update Index: oprofile.h =================================================================== RCS file: /cvsroot/oprofile/oprofile/oprofile.h,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- oprofile.h 2001/10/14 19:35:13 1.58 +++ oprofile.h 2001/10/16 15:56:46 1.59 @@ -181,18 +181,16 @@ #define op_cpu_id() (cpu_number_map(smp_processor_id())) /* branch prediction */ -#ifdef EXPECT_OK #ifndef likely +#ifdef EXPECT_OK #define likely(a) __builtin_expect((a), 1) +#else +#define likely(a) (a) #endif #ifndef unlikely +#ifdef EXPECT_OK #define unlikely(a) __builtin_expect((a), 0) -#endif #else -#ifdef likely -#error likely defined - kernel compiler and compiler specified do not match ! -#endif -#define likely(a) (a) #define unlikely(a) (a) #endif |