rpms/kernel/devel kernel-2.6.spec, 1.1522, 1.1523 linux-2.6-compile-fixes.patch, 1.29, 1.30

[fedora-cvs-commits at redhat.com]

Author: davej

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

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



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1522
retrieving revision 1.1523
diff -u -r1.1522 -r1.1523
--- kernel-2.6.spec	28 Aug 2005 21:24:09 -0000	1.1522
+++ kernel-2.6.spec	28 Aug 2005 23:40:35 -0000	1.1523
@@ -369,7 +369,7 @@
 # Not patches you're too lazy for to put in the proper place.
 #
 
-#Patch10000: linux-2.6-compile-fixes.patch
+Patch10000: linux-2.6-compile-fixes.patch
 
 # END OF PATCH DEFINITIONS
 
@@ -796,7 +796,7 @@
 #
 # misc small stuff to make things compile or otherwise improve performance
 #
-#%patch10000 -p1
+%patch10000 -p1
 
 
 # END OF PATCH APPLICATIONS

linux-2.6-compile-fixes.patch:
 zfcp_aux.c        |    5 ++---
 zfcp_ccw.c        |    2 +-
 zfcp_sysfs_port.c |    2 --
 3 files changed, 3 insertions(+), 6 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- linux-2.6-compile-fixes.patch	26 Aug 2005 02:39:52 -0000	1.29
+++ linux-2.6-compile-fixes.patch	28 Aug 2005 23:40:35 -0000	1.30
@@ -0,0 +1,49 @@
+--- linux-2.6.12/drivers/s390/scsi/zfcp_sysfs_port.c~	2005-08-28 19:37:38.000000000 -0400
++++ linux-2.6.12/drivers/s390/scsi/zfcp_sysfs_port.c	2005-08-28 19:37:58.000000000 -0400
+@@ -67,7 +67,6 @@ static DEVICE_ATTR(_name, S_IRUGO, zfcp_
+ ZFCP_DEFINE_PORT_ATTR(status, "0x%08x\n", atomic_read(&port->status));
+ ZFCP_DEFINE_PORT_ATTR(wwnn, "0x%016llx\n", port->wwnn);
+ ZFCP_DEFINE_PORT_ATTR(d_id, "0x%06x\n", port->d_id);
+-ZFCP_DEFINE_PORT_ATTR(scsi_id, "0x%x\n", port->scsi_id);
+ ZFCP_DEFINE_PORT_ATTR(in_recovery, "%d\n", atomic_test_mask
+ 		      (ZFCP_STATUS_COMMON_ERP_INUSE, &port->status));
+ ZFCP_DEFINE_PORT_ATTR(access_denied, "%d\n", atomic_test_mask
+@@ -263,7 +262,6 @@ static struct attribute_group zfcp_port_
+ static struct attribute *zfcp_port_no_ns_attrs[] = {
+ 	&dev_attr_unit_add.attr,
+ 	&dev_attr_unit_remove.attr,
+-	&dev_attr_scsi_id.attr,
+ 	NULL
+ };
+ 
+--- linux-2.6.12/drivers/s390/scsi/zfcp_aux.c~	2005-08-28 19:38:10.000000000 -0400
++++ linux-2.6.12/drivers/s390/scsi/zfcp_aux.c	2005-08-28 19:39:02.000000000 -0400
+@@ -1403,15 +1403,14 @@ zfcp_port_enqueue(struct zfcp_adapter *a
+ void
+ zfcp_port_dequeue(struct zfcp_port *port)
+ {
+-	struct fc_port *rport;
+-
+ 	zfcp_port_wait(port);
+ 	write_lock_irq(&zfcp_data.config_lock);
+ 	list_del(&port->list);
+ 	port->adapter->ports--;
+ 	write_unlock_irq(&zfcp_data.config_lock);
+ 	if (port->rport)
+-		fc_remote_port_delete(rport);
++		fc_remote_port_delete(port->rport);
++	port->rport = NULL;
+ 	zfcp_adapter_put(port->adapter);
+ 	zfcp_sysfs_port_remove_files(&port->sysfs_device,
+ 				     atomic_read(&port->status));
+--- linux-2.6.12/drivers/s390/scsi/zfcp_ccw.c~	2005-08-28 19:39:06.000000000 -0400
++++ linux-2.6.12/drivers/s390/scsi/zfcp_ccw.c	2005-08-28 19:39:30.000000000 -0400
+@@ -203,7 +203,7 @@ zfcp_ccw_set_offline(struct ccw_device *
+ {
+ 	struct zfcp_adapter *adapter;
+ 	struct zfcp_port *port;
+-	struct fc_port *rport;
++	struct fc_rport *rport;
+ 
+ 	down(&zfcp_data.config_sema);
+ 	adapter = dev_get_drvdata(&ccw_device->dev);