linux-kernel - Re: + include-linux-smph-on_each_cpu-switch-back-to-a-macro.patch added to -mm 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>] [day] [month] [year] [list]

Date:	Tue, 18 Jun 2013 16:47:46 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	akpm@...ux-foundation.org
Cc:	ralf@...ux-mips.org, geert@...ux-m68k.org, david.daney@...ium.com,
	linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>
Subject: Re: + include-linux-smph-on_each_cpu-switch-back-to-a-macro.patch
 added to -mm tree

Hi Andrew,

On Mon, 17 Jun 2013 13:31:17 -0700 akpm@...ux-foundation.org wrote:
>
> From: Andrew Morton <akpm@...ux-foundation.org>
> Subject: include/linux/smp.h:on_each_cpu(): switch back to a macro
> 
> f21afc25f9ed4 ("smp.h: Use local_irq_{save,restore}() in !SMP version of
> on_each_cpu()") converted on_each_cpu() to a C function.  This required
> inclusion of irqflags.h, which broke ia64 and mn10300 (at least) due to
> header ordering hell.
> 
> Switch on_each_cpu() back to a macro to fix this.
> 
> Reported-by: Geert Uytterhoeven <geert@...ux-m68k.org>
> Cc: David Daney <david.daney@...ium.com>
> Cc: Ralf Baechle <ralf@...ux-mips.org>
> Cc: Stephen Rothwell <sfr@...b.auug.org.au>
> Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
> ---
> 
>  include/linux/smp.h |   20 ++++++++------------
>  1 file changed, 8 insertions(+), 12 deletions(-)
> 
> diff -puN include/linux/smp.h~include-linux-smph-on_each_cpu-switch-back-to-a-macro include/linux/smp.h
> --- a/include/linux/smp.h~include-linux-smph-on_each_cpu-switch-back-to-a-macro
> +++ a/include/linux/smp.h
> @@ -11,7 +11,6 @@
>  #include <linux/list.h>
>  #include <linux/cpumask.h>
>  #include <linux/init.h>
> -#include <linux/irqflags.h>
>  
>  extern void cpu_idle(void);
>  
> @@ -140,17 +139,14 @@ static inline int up_smp_call_function(s
>  }
>  #define smp_call_function(func, info, wait) \
>  			(up_smp_call_function(func, info))
> -
> -static inline int on_each_cpu(smp_call_func_t func, void *info, int wait)
> -{
> -	unsigned long flags;
> -
> -	local_irq_save(flags);
> -	func(info);
> -	local_irq_restore(flags);
> -	return 0;
> -}
> -
> +#define on_each_cpu(func,info,wait)		\
> +	({					\
> +		unsigned long flags;		\
> +		local_irq_save(flags);		\
> +		func(info);			\
> +		local_irq_restore(flags);	\
> +		0;				\
> +	})
>  /*
>   * Note we still need to test the mask even for UP
>   * because we actually can get an empty mask from

I added this to the akpm tree in linux-next today - but with
s/flags/__flags/ in appropriate places.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped