linux-kernel - Re: linux-next: manual merge of the tip tree with the cputime tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Tue, 25 Oct 2011 17:29:22 +0200
From:	Michal Hocko <mhocko@...e.cz>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Martin Schwidefsky <schwidefsky@...ibm.com>
Subject: Re: linux-next: manual merge of the tip tree with the cputime tree

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@...b.auug.org.au
> 
> 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-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/