[oprof-cvs] CVS: oprofile/module compat.h,1.28,1.29 op_syscalls.c,1.10,1.11 op_util.c,1.5,1.6

[John L. <mov...@us...>]

Update of /cvsroot/oprofile/oprofile/module
In directory usw-pr-cvs1:/tmp/cvs-serv29854/module

Modified Files:
	compat.h op_syscalls.c op_util.c 
Log Message:

boring changes
 


Index: compat.h
===================================================================
RCS file: /cvsroot/oprofile/oprofile/module/compat.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- compat.h	1 Feb 2002 21:15:42 -0000	1.28
+++ compat.h	10 Feb 2002 20:22:56 -0000	1.29
@@ -22,6 +22,7 @@
 #define COMPAT_H
 
 #include <linux/version.h>
+#include <linux/module.h>
 
 #define V_BEFORE(a,b,c) (LINUX_VERSION_CODE < KERNEL_VERSION(a,b,c))
 #define V_EQUAL(a,b,c) (LINUX_VERSION_CODE == KERNEL_VERSION(a,b,c))
@@ -51,10 +52,9 @@
 /* Things that cannot rely on a particular linux version or are needed between
  * major release */
 
-#if V_BEFORE(2,4,10)
-	/* 2.4.10 introduced MODULE_LICENSE */
-	#define MODULE_LICENSE(x)
-#endif /* V_BEFORE(2,4,10) */
+#ifndef MODULE_LICENSE
+#define MODULE_LICENSE(x)
+#endif
 
 /* 2.4/2.5 kernel can be  patched with the preempt patch. We support only
  * recent version of this patch */

Index: op_syscalls.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/module/op_syscalls.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- op_syscalls.c	1 Feb 2002 21:15:42 -0000	1.10
+++ op_syscalls.c	10 Feb 2002 20:22:56 -0000	1.11
@@ -23,8 +23,6 @@
 #include "oprofile.h"
 #include "op_dcache.h"
 
-// FIXME: check these syscalls are same code as 2.2 where necessary
-
 extern u32 prof_on;
 
 uint dname_top;

Index: op_util.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/module/op_util.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- op_util.c	21 Jan 2002 02:47:27 -0000	1.5
+++ op_util.c	10 Feb 2002 20:22:56 -0000	1.6
@@ -20,8 +20,6 @@
 
 #include "compat.h"
 
-// FIXME: check this code works in 2.2
- 
 /* Given PGD from the address space's page table, return the kernel
  * virtual mapping of the physical memory mapped at ADR.
  */
@@ -36,8 +34,7 @@
 		if (!pmd_none(*pmd)) {
 			ptep = pte_offset(pmd, adr);
 			pte = *ptep;
-			if(pte_present(pte)) {
-				// FIXME: page_address equivalent 
+			if (pte_present(pte)) {
 				ret = (unsigned long) pte_page_address(pte);
 				ret |= adr & (PAGE_SIZE-1);
 			}
@@ -74,7 +71,6 @@
 	adr=(unsigned long) mem;
 	while (size > 0) {
 		page = kvirt_to_pa(adr);
-		// FIXME: no virt_to_page 
 		mem_map_reserve(virt_to_page(__va(page)));
 		adr += PAGE_SIZE;
 		size -= PAGE_SIZE;