The patch titled
edac: fix worktodo to proper cast
has been removed from the -mm tree. Its filename was
edac-fix-worktodo-to-proper-cast.patch
This patch was dropped because an updated version will be merged
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: edac: fix worktodo to proper cast
From: Jean Delvare <khali@xxxxxxxxxxxx>
The edac-core driver includes code which assumes that the work_struct
which is included in every delayed_work is the first member of that
structure. This is currently the case but might change in the future, so
use to_delayed_work() instead, which doesn't make such an assumption.
Signed-off-by: Jean Delvare <khali@xxxxxxxxxxxx>
Signed-off-by: Doug Thompson <dougthompson@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/edac/edac_device.c | 3 ++-
drivers/edac/edac_mc.c | 3 ++-
drivers/edac/edac_pci.c | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff -puN drivers/edac/edac_device.c~edac-fix-worktodo-to-proper-cast drivers/edac/edac_device.c
--- a/drivers/edac/edac_device.c~edac-fix-worktodo-to-proper-cast
+++ a/drivers/edac/edac_device.c
@@ -389,7 +389,8 @@ static void del_edac_device_from_global_
*/
static void edac_device_workq_function(struct work_struct *work_req)
{
- struct delayed_work *d_work = (struct delayed_work *)work_req;
+ struct delayed_work *d_work =
+ container_of(work_req, struct delayed_work, work);
struct edac_device_ctl_info *edac_dev = to_edac_device_ctl_work(d_work);
mutex_lock(&device_ctls_mutex);
diff -puN drivers/edac/edac_mc.c~edac-fix-worktodo-to-proper-cast drivers/edac/edac_mc.c
--- a/drivers/edac/edac_mc.c~edac-fix-worktodo-to-proper-cast
+++ a/drivers/edac/edac_mc.c
@@ -260,7 +260,8 @@ static int edac_mc_assert_error_check_an
*/
static void edac_mc_workq_function(struct work_struct *work_req)
{
- struct delayed_work *d_work = (struct delayed_work *)work_req;
+ struct delayed_work *d_work =
+ container_of(work_req, struct delayed_work, work);
struct mem_ctl_info *mci = to_edac_mem_ctl_work(d_work);
mutex_lock(&mem_ctls_mutex);
diff -puN drivers/edac/edac_pci.c~edac-fix-worktodo-to-proper-cast drivers/edac/edac_pci.c
--- a/drivers/edac/edac_pci.c~edac-fix-worktodo-to-proper-cast
+++ a/drivers/edac/edac_pci.c
@@ -233,7 +233,8 @@ EXPORT_SYMBOL_GPL(edac_pci_find);
*/
static void edac_pci_workq_function(struct work_struct *work_req)
{
- struct delayed_work *d_work = (struct delayed_work *)work_req;
+ struct delayed_work *d_work =
+ container_of(work_req, struct delayed_work, work);
struct edac_pci_ctl_info *pci = to_edac_pci_ctl_work(d_work);
int msec;
unsigned long delay;
_
Patches currently in -mm which might be from khali@xxxxxxxxxxxx are
origin.patch
linux-next.patch
dell-laptop-fix-uninitialized-wrong-return-value.patch
edac-fix-worktodo-to-proper-cast.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
