rpms/kernel/devel kernel-2.6.spec, 1.2848, 1.2849 linux-2.6-cell-mambo-drivers.patch, 1.6, 1.7

[fedora-cvs-commits at redhat.com]

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec linux-2.6-cell-mambo-drivers.patch 
Log Message:
Restore systemsim


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2848
retrieving revision 1.2849
diff -u -r1.2848 -r1.2849
--- kernel-2.6.spec	5 Dec 2006 14:26:50 -0000	1.2848
+++ kernel-2.6.spec	5 Dec 2006 14:47:29 -0000	1.2849
@@ -328,7 +328,6 @@
 # 300 - 399   ppc(64)
 Patch301: linux-2.6-cell-mambo-drivers.patch
 Patch310: linux-2.6-g5-therm-shutdown.patch
-Patch311: linux-2.6-power6-no-ci-large-page.patch
 
 # 400 - 499   ia64
 
@@ -755,11 +754,9 @@
 # PowerPC
 #
 # Support the IBM Mambo simulator; core as well as disk and network drivers.
-#%patch301 -p1
+%patch301 -p1 -b .mambo
 # Alleviate G5 thermal shutdown problems
 %patch310 -p1
-# Disable cache-inhibited 64KiB pages on POWER6
-#%patch311 -p1
 
 
 # S390
@@ -1805,6 +1802,10 @@
 #  - signed modules are broken
 #  - tux.
 %changelog
+* Tue Dec  5 2006 David Woodhouse <dwmw2 at redhat.com>
+- Remove cell_defconfig update from Mambo patch
+- Drop 64KiB CI page patch which is fixed differently upstream
+
 * Tue Dec  5 2006 Dave Jones <davej at redhat.com>
 - 2.6.19-git7
 

linux-2.6-cell-mambo-drivers.patch:
 Documentation/systemsim/maple.tcl        | 1141 +++++++++++++++++++++++++++++++
 Documentation/systemsim/systemsim.txt    |   92 ++
 arch/powerpc/Kconfig                     |   11 
 arch/powerpc/configs/cbesim_defconfig    |  867 +++++++++++++++++++++++
 arch/powerpc/configs/systemsim_defconfig | 1123 ++++++++++++++++++++++++++++++
 arch/powerpc/platforms/cell/setup.c      |    3 
 drivers/block/Kconfig                    |    7 
 drivers/block/Makefile                   |    2 
 drivers/block/systemsim_bd.c             |  319 ++++++++
 drivers/net/Kconfig                      |    8 
 drivers/net/Makefile                     |    1 
 drivers/net/systemsim_net.c              |  393 ++++++++++
 include/asm-powerpc/machdep.h            |    1 
 include/asm-powerpc/systemsim.h          |  132 +++
 include/asm-powerpc/udbg.h               |    1 
 15 files changed, 4099 insertions(+), 2 deletions(-)

Index: linux-2.6-cell-mambo-drivers.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-cell-mambo-drivers.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-cell-mambo-drivers.patch	23 Nov 2006 21:49:51 -0000	1.6
+++ linux-2.6-cell-mambo-drivers.patch	5 Dec 2006 14:47:29 -0000	1.7
@@ -2515,34 +2515,6 @@
 +#
 +# Hardware crypto devices
 +#
-Index: linux-2.6/arch/powerpc/configs/cell_defconfig
-===================================================================
---- linux-2.6.orig/arch/powerpc/configs/cell_defconfig
-+++ linux-2.6/arch/powerpc/configs/cell_defconfig
-@@ -131,6 +131,7 @@ CONFIG_PPC_CELL=y
- CONFIG_PPC_CELL_NATIVE=y
- CONFIG_PPC_IBM_CELL_BLADE=y
- CONFIG_UDBG_RTAS_CONSOLE=y
-+CONFIG_PPC_SYSTEMSIM=y
- # CONFIG_U3_DART is not set
- CONFIG_PPC_RTAS=y
- # CONFIG_RTAS_ERROR_LOGGING is not set
-@@ -405,6 +408,7 @@ CONFIG_BLK_DEV_RAM_COUNT=16
- CONFIG_BLK_DEV_RAM_SIZE=131072
- CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
- CONFIG_BLK_DEV_INITRD=y
-+CONFIG_BLK_DEV_SYSTEMSIM=y
- # CONFIG_CDROM_PKTCDVD is not set
- # CONFIG_ATA_OVER_ETH is not set
- 
-@@ -560,6 +564,7 @@ CONFIG_MII=y
- #
- # CONFIG_NET_TULIP is not set
- # CONFIG_HP100 is not set
-+CONFIG_SYSTEMSIM_NET=y
- # CONFIG_NET_PCI is not set
- 
- #
 Index: linux-2.6/arch/powerpc/configs/systemsim_defconfig
 ===================================================================
 --- /dev/null