[PATCH] dm: resume() name clash

From: Joe Thornber <thornber@sistina.com>

Some architectures define an extern function called resume(), which
clashes with a static function in dm-ioctl-v4.c.  Rename static one to
do_resume().

diff --git a/drivers/md/dm-ioctl-v4.c b/drivers/md/dm-ioctl-v4.c
index ebd5beb14a7758f0567ad284ed3450d0bda5a48d..2c8243aab6f531cf40b5e116f1688f1a1b8eba66 100644 (file)
--- a/drivers/md/dm-ioctl-v4.c
+++ b/drivers/md/dm-ioctl-v4.c
@@ -594,7 +594,7 @@ static int dev_rename(struct dm_ioctl *param, size_t param_size)
        return dm_hash_rename(param->name, new_name);
 }
 
-static int suspend(struct dm_ioctl *param)
+static int do_suspend(struct dm_ioctl *param)
 {
        int r = 0;
        struct mapped_device *md;
@@ -613,7 +613,7 @@ static int suspend(struct dm_ioctl *param)
        return r;
 }
 
-static int resume(struct dm_ioctl *param)
+static int do_resume(struct dm_ioctl *param)
 {
        int r = 0;
        struct hash_cell *hc;
@@ -676,9 +676,9 @@ static int resume(struct dm_ioctl *param)
 static int dev_suspend(struct dm_ioctl *param, size_t param_size)
 {
        if (param->flags & DM_SUSPEND_FLAG)
-               return suspend(param);
+               return do_suspend(param);
 
-       return resume(param);
+       return do_resume(param);
 }
 
 /*