rpms/kernel/devel linux-2.6-ppc-compile.patch, NONE, 1.1 kernel-2.6.spec, 1.1838, 1.1839

[fedora-cvs-commits at redhat.com]

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-ppc-compile.patch 
Log Message:
I want my P-P-C

linux-2.6-ppc-compile.patch:
 arch/powerpc/kernel/ppc_ksyms.c |    1 -
 drivers/ide/pci/via82cxxx.c     |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE linux-2.6-ppc-compile.patch ---
--- linux-2.6.15/drivers/ide/pci/via82cxxx.c~	2006-01-03 03:21:10.000000000 +0000
+++ linux-2.6.15/drivers/ide/pci/via82cxxx.c	2006-01-10 02:33:10.000000000 +0000
@@ -439,7 +439,7 @@ static void __devinit init_hwif_via82cxx
 	hwif->speedproc = &via_set_drive;
 
 
-#if defined(CONFIG_PPC_MULTIPLATFORM) && defined(CONFIG_PPC32)
+#if defined(CONFIG_PPC_CHRP) && defined(CONFIG_PPC32)
 	if(_machine == _MACH_chrp && _chrp_type == _CHRP_Pegasos) {
 		hwif->irq = hwif->channel ? 15 : 14;
 	}
--- linux-2.6.15/arch/powerpc/kernel/ppc_ksyms.c~	2006-01-10 02:21:45.000000000 +0000
+++ linux-2.6.15/arch/powerpc/kernel/ppc_ksyms.c	2006-01-10 02:33:37.000000000 +0000
@@ -244,7 +244,6 @@ EXPORT_SYMBOL(set_context);
 extern long mol_trampoline;
 EXPORT_SYMBOL(mol_trampoline); /* For MOL */
 EXPORT_SYMBOL(flush_hash_pages); /* For MOL */
-EXPORT_SYMBOL_GPL(__handle_mm_fault); /* For MOL */
 #ifdef CONFIG_SMP
 extern int mmu_hash_lock;
 EXPORT_SYMBOL(mmu_hash_lock); /* For MOL */


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1838
retrieving revision 1.1839
diff -u -r1.1838 -r1.1839
--- kernel-2.6.spec	10 Jan 2006 01:45:59 -0000	1.1838
+++ kernel-2.6.spec	10 Jan 2006 02:53:27 -0000	1.1839
@@ -156,7 +156,7 @@
 Version: %{rpmversion}
 Release: %{release}
 #ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x
-ExclusiveArch: noarch %{all_x86} x86_64 ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
@@ -227,6 +227,7 @@
 # 300 - 399   ppc(64)
 Patch300: linux-2.6.15-default-powerpc.patch
 Patch301: linux-2.6.15-spufs-compile.patch
+Patch302: linux-2.6-ppc-compile.patch
 Patch304: linux-2.6.15-mv643xx-fixes.patch
 Patch305: linux-2.6-cell-mambo-drivers.patch
 Patch306: linux-2.6-hvc-console.patch
@@ -634,6 +635,8 @@
 %patch300 -p1
 # Fix spufs build
 %patch301 -p1
+# Fix ppc32 build
+%patch302 -p1
 # Fix the MV643xx Gigabit Ethernet driver
 %patch304 -p1
 # Support the IBM Mambo simulator; core as well as disk and network drivers.