[PATCH 1/1] jump_label: tidy jump_label_ratelimit.h

[PATCH 1/1] jump_label: tidy jump_label_ratelimit.h

[Zhouyi Zhou]

jump_label_ratelimit.h is split from jump_label.h to enable the 
includers who don't want linux/workqueue.h.
As HAVE_JUMP_LABEL is only defined in jump_label.h, will following  
patch makes jump_labe_ratelimit.h more tidy?

Compiled and Tested in x86_64
Signed-off-by: Zhouyi Zhou <yizhouzhou@ict.ac.cn>
---
 include/linux/jump_label_ratelimit.h |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/include/linux/jump_label_ratelimit.h b/include/linux/jump_label_ratelimit.h
index 089f70f..0d34d7e 100644
--- a/include/linux/jump_label_ratelimit.h
+++ b/include/linux/jump_label_ratelimit.h
@@ -4,15 +4,12 @@
 #include <linux/jump_label.h>
 #include <linux/workqueue.h>
 
-#if defined(CC_HAVE_ASM_GOTO) && defined(CONFIG_JUMP_LABEL)
+#ifdef HAVE_JUMP_LABEL
 struct static_key_deferred {
 	struct static_key key;
 	unsigned long timeout;
 	struct delayed_work work;
 };
-#endif
-
-#ifdef HAVE_JUMP_LABEL
 extern void static_key_slow_dec_deferred(struct static_key_deferred *key);
 extern void
 jump_label_rate_limit(struct static_key_deferred *key, unsigned long rl);
-- 
1.7.10.4

Re: [PATCH 1/1] jump_label: tidy jump_label_ratelimit.h

[Jason Baron]

Yes, that looks good. While at it I grep'd the tree for
'CONFIG_JUMP_LABEL', and found some uses in the
netfilter code which should probably be
'HAVE_JUMP_LABEL' as well.

Thanks,

-Jason

On 08/20/2014 05:29 AM, Zhouyi Zhou wrote:
> jump_label_ratelimit.h is split from jump_label.h to enable the 
> includers who don't want linux/workqueue.h.
> As HAVE_JUMP_LABEL is only defined in jump_label.h, will following  
> patch makes jump_labe_ratelimit.h more tidy?
>
> Compiled and Tested in x86_64
> Signed-off-by: Zhouyi Zhou <yizhouzhou@ict.ac.cn>
> ---
>  include/linux/jump_label_ratelimit.h |    5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/include/linux/jump_label_ratelimit.h b/include/linux/jump_label_ratelimit.h
> index 089f70f..0d34d7e 100644
> --- a/include/linux/jump_label_ratelimit.h
> +++ b/include/linux/jump_label_ratelimit.h
> @@ -4,15 +4,12 @@
>  #include <linux/jump_label.h>
>  #include <linux/workqueue.h>
>  
> -#if defined(CC_HAVE_ASM_GOTO) && defined(CONFIG_JUMP_LABEL)
> +#ifdef HAVE_JUMP_LABEL
>  struct static_key_deferred {
>  	struct static_key key;
>  	unsigned long timeout;
>  	struct delayed_work work;
>  };
> -#endif
> -
> -#ifdef HAVE_JUMP_LABEL
>  extern void static_key_slow_dec_deferred(struct static_key_deferred *key);
>  extern void
>  jump_label_rate_limit(struct static_key_deferred *key, unsigned long rl);

Re: [PATCH 1/1] jump_label: tidy jump_label_ratelimit.h

[Zhouyi Zhou]

Thanks Jason for reviewing it 
> -----Original Messages-----
> From: "Jason Baron" <jbaron@akamai.com>
> Sent Time: Thursday, August 21, 2014
> To: "Zhouyi Zhou" <zhouzhouyi@gmail.com>
> Cc: drjones@redhat.com, konrad.wilk@oracle.com, raghavendra.kt@linux.vnet.ibm.com, mingo@kernel.org, davem@davemloft.net, hannes@stressinduktion.org, linux-kernel@vger.kernel.org, "Zhouyi Zhou" <yizhouzhou@ict.ac.cn>
> Subject: Re: [PATCH 1/1] jump_label: tidy jump_label_ratelimit.h
> 
> Yes, that looks good. While at it I grep'd the tree for
> 'CONFIG_JUMP_LABEL', and found some uses in the
> netfilter code which should probably be
> 'HAVE_JUMP_LABEL' as well.
I have submitted two patches according to you suggestions:
https://lkml.org/lkml/2014/8/20/885
https://lkml.org/lkml/2014/8/20/883
Hope I have made them right

Thanks 
Zhouyi
> 
> Thanks,
> 
> -Jason
> 
> On 08/20/2014 05:29 AM, Zhouyi Zhou wrote:
> > jump_label_ratelimit.h is split from jump_label.h to enable the 
> > includers who don't want linux/workqueue.h.
> > As HAVE_JUMP_LABEL is only defined in jump_label.h, will following  
> > patch makes jump_labe_ratelimit.h more tidy?
> >
> > Compiled and Tested in x86_64
> > Signed-off-by: Zhouyi Zhou <yizhouzhou@ict.ac.cn>
> > ---
> >  include/linux/jump_label_ratelimit.h |    5 +----
> >  1 file changed, 1 insertion(+), 4 deletions(-)
> >
> > diff --git a/include/linux/jump_label_ratelimit.h b/include/linux/jump_label_ratelimit.h
> > index 089f70f..0d34d7e 100644
> > --- a/include/linux/jump_label_ratelimit.h
> > +++ b/include/linux/jump_label_ratelimit.h
> > @@ -4,15 +4,12 @@
> >  #include <linux/jump_label.h>
> >  #include <linux/workqueue.h>
> >  
> > -#if defined(CC_HAVE_ASM_GOTO) && defined(CONFIG_JUMP_LABEL)
> > +#ifdef HAVE_JUMP_LABEL
> >  struct static_key_deferred {
> >  	struct static_key key;
> >  	unsigned long timeout;
> >  	struct delayed_work work;
> >  };
> > -#endif
> > -
> > -#ifdef HAVE_JUMP_LABEL
> >  extern void static_key_slow_dec_deferred(struct static_key_deferred *key);
> >  extern void
> >  jump_label_rate_limit(struct static_key_deferred *key, unsigned long rl);
> 

Re: [PATCH 1/1] jump_label: tidy jump_label_ratelimit.h

[Jason Baron]

On 08/20/2014 10:58 PM, Zhouyi Zhou wrote:
> I have submitted two patches according to you suggestions:
> https://lkml.org/lkml/2014/8/20/885
> https://lkml.org/lkml/2014/8/20/883
> Hope I have made them right
> 

Thanks - they look good to me.

-Jason