rpms/kernel/F-8 config-generic, 1.53, 1.54 linux-2.6-firewire-git-pending.patch, 1.6, 1.7

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23490

Modified Files:
	config-generic linux-2.6-firewire-git-pending.patch 
Log Message:
Oops, fix missing fix in formerly missing fix. :)


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/config-generic,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- config-generic	12 Mar 2008 20:25:04 -0000	1.53
+++ config-generic	17 Mar 2008 20:58:53 -0000	1.54
@@ -3083,7 +3083,7 @@
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_PROC_PID_CPUSET=y
 
-# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_SYSFS_DEPRECATED=y
 
 CONFIG_RELAY=y
 # CONFIG_PRINTK_TIME is not set

linux-2.6-firewire-git-pending.patch:

Index: linux-2.6-firewire-git-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-firewire-git-pending.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-firewire-git-pending.patch	17 Mar 2008 20:33:48 -0000	1.6
+++ linux-2.6-firewire-git-pending.patch	17 Mar 2008 20:58:53 -0000	1.7
@@ -480,9 +480,9 @@
 Oops, some of the important bits got dropped when back-porting to 2.6.24...
 Add 'em back right here. We'll sort out changelog entries later...
 
-diff -up linux-2.6.24.noarch/drivers/firewire.orig/fw-ohci.c linux-2.6.24.noarch/drivers/firewire/fw-ohci.c
---- linux-2.6.24.noarch/drivers/firewire.orig/fw-ohci.c	2008-03-17 16:05:25.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/firewire/fw-ohci.c	2008-03-17 16:17:40.000000000 -0400
+diff -Naurp linux.orig/drivers/firewire/fw-ohci.c linux/drivers/firewire/fw-ohci.c
+--- linux.orig/drivers/firewire/fw-ohci.c	2008-03-17 16:52:40.000000000 -0400
++++ linux/drivers/firewire/fw-ohci.c	2008-03-17 16:54:58.000000000 -0400
 @@ -188,7 +188,7 @@ struct fw_ohci {
  	struct tasklet_struct bus_reset_tasklet;
  	int node_id;
@@ -500,7 +500,8 @@
 +	dma_addr_t uninitialized_var(ab_bus);
  	size_t offset;
  
- 	ab = (struct ar_buffer *) __get_free_page(GFP_ATOMIC);
+-	ab = (struct ar_buffer *) __get_free_page(GFP_ATOMIC);
++	ab = dma_alloc_coherent(dev, PAGE_SIZE, &ab_bus, GFP_ATOMIC);
  	if (ab == NULL)
  		return -ENOMEM;
  
@@ -561,9 +562,9 @@
  
  	fw_notify("Removed fw-ohci device.\n");
  }
-diff -up linux-2.6.24.noarch/drivers/firewire.orig/fw-sbp2.c linux-2.6.24.noarch/drivers/firewire/fw-sbp2.c
---- linux-2.6.24.noarch/drivers/firewire.orig/fw-sbp2.c	2008-03-17 16:05:25.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/firewire/fw-sbp2.c	2008-03-17 16:18:47.000000000 -0400
+diff -Naurp linux.orig/drivers/firewire/fw-sbp2.c linux/drivers/firewire/fw-sbp2.c
+--- linux.orig/drivers/firewire/fw-sbp2.c	2008-03-17 16:52:40.000000000 -0400
++++ linux/drivers/firewire/fw-sbp2.c	2008-03-17 16:53:55.000000000 -0400
 @@ -847,7 +847,7 @@ static void sbp2_set_busy_timeout(struct
  	struct fw_device *device = fw_device(lu->tgt->unit->device.parent);
  	DECLARE_COMPLETION_ONSTACK(done);
@@ -583,9 +584,9 @@
  	if (lu->tgt->workarounds & SBP2_WORKAROUND_INQUIRY_36)
  		sdev->inquiry_len = 36;
  
-diff -up linux-2.6.24.noarch/drivers/firewire.orig/fw-transaction.h linux-2.6.24.noarch/drivers/firewire/fw-transaction.h
---- linux-2.6.24.noarch/drivers/firewire.orig/fw-transaction.h	2008-03-17 16:05:25.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/firewire/fw-transaction.h	2008-03-17 16:19:02.000000000 -0400
+diff -Naurp linux.orig/drivers/firewire/fw-transaction.h linux/drivers/firewire/fw-transaction.h
+--- linux.orig/drivers/firewire/fw-transaction.h	2008-03-17 16:52:40.000000000 -0400
++++ linux/drivers/firewire/fw-transaction.h	2008-03-17 16:53:55.000000000 -0400
 @@ -224,8 +224,6 @@ struct fw_card {
  
  	int node_id;