rpms/kernel/devel kernel.spec, 1.868, 1.869 linux-2.6-firewire-git-update.patch, 1.16, 1.17

Jarod Wilson (jwilson) fedora-extras-commits at redhat.com
Fri Aug 8 18:43:06 UTC 2008


Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26607

Modified Files:
	kernel.spec linux-2.6-firewire-git-update.patch 
Log Message:
* Fri Aug 08 2008 Jarod Wilson <jwilson at redhat.com>
- Rebase and re-enable firewire git tree patch



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.868
retrieving revision 1.869
diff -u -r1.868 -r1.869
--- kernel.spec	8 Aug 2008 17:07:32 -0000	1.868
+++ kernel.spec	8 Aug 2008 18:42:36 -0000	1.869
@@ -1159,7 +1159,7 @@
 #ApplyPatch linux-2.6-drm-fix-master-perm.patch
 
 # linux1394 git patches
-#ApplyPatch linux-2.6-firewire-git-update.patch
+ApplyPatch linux-2.6-firewire-git-update.patch
 #C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-firewire-git-pending.patch | awk '{print $1}')
 #if [ "$C" -gt 10 ]; then
 #ApplyPatch linux-2.6-firewire-git-pending.patch
@@ -1736,6 +1736,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Aug 08 2008 Jarod Wilson <jwilson at redhat.com>
+- Rebase and re-enable firewire git tree patch
+
 * Fri Aug  8 2008 Kristian Høgsberg <krh at redhat.com>
 - Export module device table for radeon DRM driver.
 

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

Index: linux-2.6-firewire-git-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-firewire-git-update.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- linux-2.6-firewire-git-update.patch	4 Aug 2008 22:38:45 -0000	1.16
+++ linux-2.6-firewire-git-update.patch	8 Aug 2008 18:42:36 -0000	1.17
@@ -1,5 +1,5 @@
-Diff between linux-2.6-git at version 2.6.27-rc1-git4 and the linux1394-2.6-git
-tree at commit 2d2da062fae0d87c5a6ad241662040ad9895e5be on 2008-08-04.
+Diff between linux-2.6-git at version 2.6.27-rc2-git1 and the linux1394-2.6-git
+tree at commit 2d2da062fae0d87c5a6ad241662040ad9895e5be on 2008-08-08.
 
 Not done via straight git, since the linux1394-2.6-git tree hasn't been rebased
 since 2.6.26, which makes things a touch messy right now...
@@ -106,52 +106,6 @@
  			/*
  			 * The lock request failed, maybe the IRM
  			 * isn't really IRM capable after all. Let's
-diff -Naurp linux-2.6-git/drivers/firewire/fw-cdev.c firewire-git/drivers/firewire/fw-cdev.c
---- linux-2.6-git/drivers/firewire/fw-cdev.c	2008-08-04 18:04:26.000000000 -0400
-+++ firewire-git/drivers/firewire/fw-cdev.c	2008-08-04 16:39:51.000000000 -0400
-@@ -369,22 +369,33 @@ complete_transaction(struct fw_card *car
- 	struct response *response = data;
- 	struct client *client = response->client;
- 	unsigned long flags;
-+	struct fw_cdev_event_response *r = &response->response;
- 
--	if (length < response->response.length)
--		response->response.length = length;
-+	if (length < r->length)
-+		r->length = length;
- 	if (rcode == RCODE_COMPLETE)
--		memcpy(response->response.data, payload,
--		       response->response.length);
-+		memcpy(r->data, payload, r->length);
- 
- 	spin_lock_irqsave(&client->lock, flags);
- 	list_del(&response->resource.link);
- 	spin_unlock_irqrestore(&client->lock, flags);
- 
--	response->response.type   = FW_CDEV_EVENT_RESPONSE;
--	response->response.rcode  = rcode;
--	queue_event(client, &response->event, &response->response,
--		    sizeof(response->response) + response->response.length,
--		    NULL, 0);
-+	r->type   = FW_CDEV_EVENT_RESPONSE;
-+	r->rcode  = rcode;
-+
-+	/*
-+	 * In the case that sizeof(*r) doesn't align with the position of the
-+	 * data, and the read is short, preserve an extra copy of the data
-+	 * to stay compatible with a pre-2.6.27 bug.  Since the bug is harmless
-+	 * for short reads and some apps depended on it, this is both safe
-+	 * and prudent for compatibility.
-+	 */
-+	if (r->length <= sizeof(*r) - offsetof(typeof(*r), data))
-+		queue_event(client, &response->event, r, sizeof(*r),
-+			    r->data, r->length);
-+	else
-+		queue_event(client, &response->event, r, sizeof(*r) + r->length,
-+			    NULL, 0);
- }
- 
- static int ioctl_send_request(struct client *client, void *buffer)
 diff -Naurp linux-2.6-git/drivers/firewire/fw-device.c firewire-git/drivers/firewire/fw-device.c
 --- linux-2.6-git/drivers/firewire/fw-device.c	2008-07-23 15:03:03.000000000 -0400
 +++ firewire-git/drivers/firewire/fw-device.c	2008-08-04 16:39:51.000000000 -0400




More information about the fedora-extras-commits mailing list