From: John L. <mov...@us...> - 2002-01-24 17:35:54
|
Update of /cvsroot/oprofile/oprofile/module In directory usw-pr-cvs1:/tmp/cvs-serv27613/module Modified Files: compat.h compat22.h compat24.h Log Message: pte_page fix Index: compat.h =================================================================== RCS file: /cvsroot/oprofile/oprofile/module/compat.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- compat.h 2002/01/22 20:36:09 1.23 +++ compat.h 2002/01/24 17:35:49 1.24 @@ -38,6 +38,12 @@ #define minor(dev) MINOR(dev) #endif +#if V_BEFORE(2,2,20) +#define pte_page_address(a) pte_page(a) +#else +#define pte_page_address(a) page_address(pte_page(a)) +#endif /* BEFORE 2.2.20 */ + /* Things that cannot rely on a particular linux version or are needed between * major release */ Index: compat22.h =================================================================== RCS file: /cvsroot/oprofile/oprofile/module/compat22.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- compat22.h 2002/01/22 20:36:09 1.13 +++ compat22.h 2002/01/24 17:35:49 1.14 @@ -25,8 +25,6 @@ #include <linux/smp_lock.h> -/* FIXME: didn't this change in 2.2.21 ? */ -#define pte_page_address(x) pte_page(x) #define GET_VM_OFFSET(v) ((v)->vm_offset) #define MODULE_LICENSE(l) #define NEED_2_2_DENTRIES Index: compat24.h =================================================================== RCS file: /cvsroot/oprofile/oprofile/module/compat24.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- compat24.h 2002/01/21 02:57:07 1.11 +++ compat24.h 2002/01/24 17:35:49 1.12 @@ -33,7 +33,6 @@ #define hash_path(f) do_path_hash_2_4((f)->f_dentry, (f)->f_vfsmnt) #define request_region_check request_region #define op_cpu_id() cpu_number_map(smp_processor_id()) -#define pte_page_address(x) page_address(pte_page(x)) #define GET_VM_OFFSET(v) ((v)->vm_pgoff << PAGE_SHIFT) #define PTRACE_OFF(t) ((t)->ptrace &= ~PT_DTRACE) #define lock_execve() do { } while (0) |