From 9b111f7660918cf94cd1129a0723d8d478b5b068 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 6 Aug 2003 21:13:03 -0700 Subject: [PATCH] [PATCH] dm: resume() name clash From: Joe Thornber 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(). --- drivers/md/dm-ioctl-v4.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/md/dm-ioctl-v4.c b/drivers/md/dm-ioctl-v4.c index ebd5beb14a77..2c8243aab6f5 100644 --- 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); } /* -- 2.39.5