Messages in this thread Patch in this message | | | Date | Thu, 4 Mar 2010 15:22:22 -0500 (EST) | From | Alan Stern <> | Subject | Weirdness in patch |
| |
Greg:
In my copy of gregkh-all-2.6.33.patch (which is dated 2010-03-01), there are changes to drivers/base/power/main.c, coming from the gregkh-05-driver-core/driver-core-create-lock-unlock-functions-for-struct-device patch.
The first weird thing is this. That file as it currently exists on www.kernel.org (dated 2010-03-03) contains the following hunk (it's the last hunk for drivers/base/power/main.c):
@@ -962,7 +962,7 @@ static int device_prepare(struct device suspend_report_result(dev->class->pm->prepare, error); } End: - up(&dev->sem); + device_unlock(dev); return error; }
But in my copy of gregkh-all-2.6.33.patch, the corresponding hunk is:
@@ -852,7 +852,7 @@ suspend_report_result(dev->class->pm->prepare, error); } End: - up(&dev->sem); + device_lock(dev); return error; } The device_unlock() got changed to device_lock()! That messed up my suspend testing for a while...
Secondly, none of these changes is present in the gregkh-all-2.6.33.patch file at www.kernel.org. Isn't that supposed to contain all the patches from the subsystems merged into one?
What's the story?
Alan Stern
| |