lkml.org 
[lkml]   [2003]   [Jul]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subjectdm: v4 ioctl interface (was: Re: Linux v2.6.0-test2)
On Sun, 27 Jul 2003, Linus Torvalds wrote:
> Summary of changes from v2.6.0-test1 to v2.6.0-test2
> ============================================
>
> Andrew Morton:
> o dm: v4 ioctl interface

This interface code contains a local `resume()' routine, which conflicts with
the `resume()' defined by many architectures in <asm/*.h>. The patch below
fixes this by renaming the local routine to `do_resume()'.

However, after this change it still doesn't compile...

--- linux-2.6.0-test2/drivers/md/dm-ioctl-v4.c.orig Tue Jul 29 23:23:17 2003
+++ linux-2.6.0-test2/drivers/md/dm-ioctl-v4.c Wed Jul 30 23:17:16 2003
@@ -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;
@@ -678,7 +678,7 @@
if (param->flags & DM_SUSPEND_FLAG)
return suspend(param);

- return resume(param);
+ return do_resume(param);
}

/*
Gr{oetje,eeting}s,
Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds


-
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.194 / U:0.892 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site