On Tue 25-10-11 18:40:02, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in
> include/asm-generic/cputime.h between commit f6116715d1ba ("[S390]
> cputime: add sparse checking and cleanup") from the cputime tree and
> commit ef0e0f5ed9bd ("cputime: Clean up cputime_to_usecs and
> usecs_to_cputime macros") from the tip tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
This one looks good as well.
> --
> Cheers,
> Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
>
> diff --cc include/asm-generic/cputime.h
> index 77202e2,62ce682..0000000
> --- a/include/asm-generic/cputime.h
> +++ b/include/asm-generic/cputime.h
> @@@ -23,10 -38,8 +23,10 @@@ typedef u64 __nocast cputime64_t
> /*
> * Convert cputime to microseconds and back.
> */
> -#define cputime_to_usecs(__ct) jiffies_to_usecs(__ct)
> -#define usecs_to_cputime(__msecs) usecs_to_jiffies(__msecs)
> +#define cputime_to_usecs(__ct) \
> - jiffies_to_usecs(cputime_to_jiffies(__ct));
> ++ jiffies_to_usecs(cputime_to_jiffies(__ct))
> +#define usecs_to_cputime(__msecs) \
> - jiffies_to_cputime(usecs_to_jiffies(__msecs));
> ++ jiffies_to_cputime(usecs_to_jiffies(__msecs))
>
> /*
> * Convert cputime to seconds and back.
--
Michal Hocko
SUSE Labs
SUSE LINUX s.r.o.
Lihovarska 1060/12
190 00 Praha 9
Czech Republic
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
