rpms/kernel/devel linux-2.6-compile-fixes.patch, 1.34, 1.35 kernel-2.6.spec, 1.1653, 1.1654

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20059

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-compile-fixes.patch 
Log Message:
build fixes


linux-2.6-compile-fixes.patch:
 Kconfig         |    1 +
 mm/ppc_mmu_32.c |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: linux-2.6-compile-fixes.patch
diff -N linux-2.6-compile-fixes.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-compile-fixes.patch	8 Nov 2005 04:03:32 -0000	1.35
@@ -0,0 +1,24 @@
+--- linux-2.6.14/arch/powerpc/mm/ppc_mmu_32.c~	2005-11-07 22:57:40.000000000 -0500
++++ linux-2.6.14/arch/powerpc/mm/ppc_mmu_32.c	2005-11-07 22:58:09.000000000 -0500
+@@ -188,9 +188,9 @@ void hash_preload(struct mm_struct *mm, 
+ 
+ 	if (Hash == 0)
+ 		return;
+-	pmd = pmd_offset(pgd_offset(vma->vm_mm, address), address);
++	pmd = pmd_offset(pgd_offset(mm, ea), ea);
+ 	if (!pmd_none(*pmd))
+-		add_hash_page(vma->vm_mm->context, address, pmd_val(*pmd));
++		add_hash_page(mm->context, ea, pmd_val(*pmd));
+ }
+ 
+ /*
+--- linux-2.6.14/arch/powerpc/Kconfig~	2005-11-07 22:58:13.000000000 -0500
++++ linux-2.6.14/arch/powerpc/Kconfig	2005-11-07 22:58:26.000000000 -0500
+@@ -605,6 +605,7 @@ config NODES_SPAN_OTHER_NODES
+ 
+ config PPC_64K_PAGES
+ 	bool "64k page size"
++	depends on PPC64
+ 	help
+ 	  This option changes the kernel logical page size to 64k. On machines
+           without processor support for 64k pages, the kernel will simulate


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1653
retrieving revision 1.1654
diff -u -r1.1653 -r1.1654
--- kernel-2.6.spec	8 Nov 2005 03:41:10 -0000	1.1653
+++ kernel-2.6.spec	8 Nov 2005 04:03:32 -0000	1.1654
@@ -355,8 +355,10 @@
 # Not patches you're too lazy for to put in the proper place.
 #
 
-Patch10000: linux-2.6-kdump-needs-not-embedded.patch
-Patch10001: linux-2.6-proc-vmcore-needs-not-embedded.patch
+Patch10000: linux-2.6-compile-fixes.patch
+
+Patch10001: linux-2.6-kdump-needs-not-embedded.patch
+Patch10002: linux-2.6-proc-vmcore-needs-not-embedded.patch
 
 # END OF PATCH DEFINITIONS
 
@@ -817,6 +819,7 @@
 #
 %patch10000 -p1
 %patch10001 -p1
+%patch10002 -p1
 
 
 # END OF PATCH APPLICATIONS