lkml.org 
[lkml]   [2003]   [Jul]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [Patch 7/6 (so I can't count)] dm: resume() name clash
    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/drivers/md/dm-ioctl-v4.c 2003-07-31 11:55:02.000000000 +0100
    +++ source/drivers/md/dm-ioctl-v4.c 2003-07-31 11:53:51.000000000 +0100
    @@ -594,7 +594,7 @@
    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 @@
    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 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);
    }

    /*
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2005-03-22 13:47    [W:0.021 / U:59.696 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site