rpms/kernel/devel kernel-2.6.spec, 1.1753, 1.1754 linux-2.6-cell-mambo-drivers.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec linux-2.6-cell-mambo-drivers.patch 
Log Message:
fix mambo_bd


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1753
retrieving revision 1.1754
diff -u -r1.1753 -r1.1754
--- kernel-2.6.spec	12 Dec 2005 05:42:39 -0000	1.1753
+++ kernel-2.6.spec	12 Dec 2005 13:08:07 -0000	1.1754
@@ -1347,6 +1347,10 @@
 %endif
 
 %changelog
+* Mon Dec 12 2005 David Woodhouse <dwmw2 at redhat.com>
+- Make mambo_disk not run on real hardware; only on sim
+- Also make it a module
+
 * Sun Dec 11 2005 Dave Jones <davej at redhat.com>
 - Re-add ISA soundblaster drivers. (#175492)
 

linux-2.6-cell-mambo-drivers.patch:
 arch/powerpc/Kconfig                |   21 +
 arch/powerpc/platforms/cell/iommu.c |    6 
 b/drivers/block/mambo_bd.c          |  291 ++++++++++++++++++++++++++
 b/drivers/net/mambonet.c            |  392 ++++++++++++++++++++++++++++++++++++
 b/include/asm-powerpc/systemsim.h   |  130 +++++++++++
 drivers/block/Makefile              |    1 
 drivers/net/Makefile                |    1 
 include/asm-powerpc/processor.h     |   17 +
 include/linux/root_dev.h            |    3 
 9 files changed, 861 insertions(+), 1 deletion(-)

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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-cell-mambo-drivers.patch	8 Dec 2005 22:50:06 -0000	1.1
+++ linux-2.6-cell-mambo-drivers.patch	12 Dec 2005 13:08:07 -0000	1.2
@@ -40,7 +40,7 @@
  obj-$(CONFIG_BLK_DEV_UB)	+= ub.o
 --- /dev/null
 +++ b/drivers/block/mambo_bd.c
-@@ -0,0 +1,288 @@
+@@ -0,0 +1,291 @@
 +/*
 + *  Bogus Block Driver for PowerPC Full System Simulator
 + *
@@ -148,6 +148,9 @@
 +	struct gendisk *disk = mbd_dev[devno].disk;
 +	unsigned int sz;
 +
++	if (!__onsim())
++		return -1;
++
 +	/* check disk configured */
 +	if (!MamboBogusDiskInfo(BD_INFO_STATUS, devno)) {
 +		printk(KERN_ERR