mkexec/3.0/2.6/arch/i386/kernel machine_mkexec.c, 1.2, 1.3 minik_dump.c, 1.2, 1.3

[Itsuro O. <od...@us...>]

Update of /cvsroot/mkdump/mkexec/3.0/2.6/arch/i386/kernel
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28946/arch/i386/kernel

Modified Files:
	machine_mkexec.c minik_dump.c 
Log Message:
fix for support newer linux kernel version (2.6.17)


Index: minik_dump.c
===================================================================
RCS file: /cvsroot/mkdump/mkexec/3.0/2.6/arch/i386/kernel/minik_dump.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** minik_dump.c	14 Feb 2006 05:50:28 -0000	1.2
--- minik_dump.c	22 Nov 2006 00:29:07 -0000	1.3
***************
*** 67,71 ****
                  }
          }
!         pgdat = pgdat_list;
          i = 0;
  	if (avoid_pfn && avoid_pfn < pfn_pgdat(pgdat) + size_pgdat(pgdat)) {
--- 67,71 ----
                  }
          }
!         pgdat = first_pgdat();
          i = 0;
  	if (avoid_pfn && avoid_pfn < pfn_pgdat(pgdat) + size_pgdat(pgdat)) {

Index: machine_mkexec.c
===================================================================
RCS file: /cvsroot/mkdump/mkexec/3.0/2.6/arch/i386/kernel/machine_mkexec.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** machine_mkexec.c	14 Feb 2006 05:50:28 -0000	1.2
--- machine_mkexec.c	22 Nov 2006 00:29:07 -0000	1.3
***************
*** 40,44 ****
--- 40,46 ----
  
  	dir = pgd_offset(&init_mm, addr);
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 15)
  	spin_lock(&init_mm.page_table_lock);
+ #endif
  
  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12)
***************
*** 53,57 ****
--- 55,63 ----
  		goto out;
  	}
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 15)
  	pte = pte_alloc_kernel(&init_mm, pmd, addr);
+ #else
+ 	pte = pte_alloc_kernel(pmd, addr);
+ #endif
  	if (pte == NULL) {
      		error = -ENOMEM;
***************
*** 65,69 ****
--- 71,77 ----
  #endif
  out:
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 15)
  	spin_unlock(&init_mm.page_table_lock);
+ #endif
  
  	return error;