rpms/kernel/FC-4 linux-2.6-g5-dualcore.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: dwmw2

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

Modified Files:
	linux-2.6-g5-dualcore.patch 
Log Message:
Make maple build too

linux-2.6-g5-dualcore.patch:
 linux-2.6.15/arch/powerpc/platforms/maple/setup.c              |    4 
 linux-newg5-backport/arch/powerpc/Kconfig                      |    6 
 linux-newg5-backport/arch/powerpc/kernel/Makefile              |    3 
 linux-newg5-backport/arch/powerpc/kernel/pci_64.c              |   24 
 linux-newg5-backport/arch/powerpc/kernel/prom.c                |   12 
 linux-newg5-backport/arch/powerpc/kernel/prom_parse.c          |  547 ++++++++++
 linux-newg5-backport/arch/powerpc/platforms/powermac/feature.c |  192 ++-
 linux-newg5-backport/arch/powerpc/platforms/powermac/pci.c     |  299 ++++-
 linux-newg5-backport/arch/powerpc/platforms/powermac/pic.c     |  474 ++++----
 linux-newg5-backport/arch/powerpc/platforms/powermac/pmac.h    |    6 
 linux-newg5-backport/arch/powerpc/platforms/powermac/setup.c   |   24 
 linux-newg5-backport/arch/powerpc/platforms/powermac/smp.c     |  341 +++---
 linux-newg5-backport/arch/powerpc/sysdev/dart.h                |   41 
 linux-newg5-backport/arch/powerpc/sysdev/mpic.c                |  220 ++--
 linux-newg5-backport/arch/powerpc/sysdev/u3_iommu.c            |  173 +--
 linux-newg5-backport/arch/ppc/kernel/pci.c                     |   17 
 linux-newg5-backport/drivers/macintosh/smu.c                   |   57 -
 linux-newg5-backport/drivers/pci/probe.c                       |    2 
 linux-newg5-backport/drivers/video/nvidia/nv_hw.c              |   81 +
 linux-newg5-backport/drivers/video/nvidia/nv_setup.c           |    3 
 linux-newg5-backport/drivers/video/nvidia/nvidia.c             |    9 
 linux-newg5-backport/include/asm-powerpc/iommu.h               |    6 
 linux-newg5-backport/include/asm-powerpc/keylargo.h            |   10 
 linux-newg5-backport/include/asm-powerpc/mmu.h                 |    2 
 linux-newg5-backport/include/asm-powerpc/mpic.h                |    4 
 linux-newg5-backport/include/asm-powerpc/pci-bridge.h          |    9 
 linux-newg5-backport/include/asm-powerpc/pmac_feature.h        |    2 
 linux-newg5-backport/include/asm-powerpc/prom.h                |   31 
 linux-newg5-backport/include/asm-ppc/pci-bridge.h              |    9 
 linux-newg5-backport/include/asm-ppc/prom.h                    |   32 
 linux-newg5-backport/include/linux/pci_regs.h                  |    1 
 31 files changed, 1912 insertions(+), 729 deletions(-)

Index: linux-2.6-g5-dualcore.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-g5-dualcore.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-g5-dualcore.patch	4 Mar 2006 23:05:38 -0000	1.1
+++ linux-2.6-g5-dualcore.patch	4 Mar 2006 23:08:14 -0000	1.2
@@ -4149,3 +4149,23 @@
  #define  PCI_CAP_ID_SHPC 	0x0C	/* PCI Standard Hot-Plug Controller */
  #define  PCI_CAP_ID_EXP 	0x10	/* PCI Express */
  #define  PCI_CAP_ID_MSIX	0x11	/* MSI-X */
+--- linux-2.6.15/arch/powerpc/platforms/maple/setup.c~	2006-01-03 03:21:10.000000000 +0000
++++ linux-2.6.15/arch/powerpc/platforms/maple/setup.c	2006-03-04 23:07:26.000000000 +0000
+@@ -208,7 +208,7 @@ static void __init maple_init_early(void
+ 	/* Setup interrupt mapping options */
+ 	ppc64_interrupt_controller = IC_OPEN_PIC;
+ 
+-	iommu_init_early_u3();
++	iommu_init_early_dart();
+ 
+ 	DBG(" <- maple_init_early\n");
+ }
+@@ -270,7 +270,7 @@ static int __init maple_probe(int platfo
+ 	 * occupies having to be broken up so the DART itself is not
+ 	 * part of the cacheable linar mapping
+ 	 */
+-	alloc_u3_dart_table();
++	alloc_dart_table();
+ 
+ 	return 1;
+ }