Patch "staging: wlags49_h2: fix extern inline functions" has been added to the 3.10-stable tree

Patch "staging: wlags49_h2: fix extern inline functions" has been added to the 3.10-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    staging: wlags49_h2: fix extern inline functions

to the 3.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     staging-wlags49_h2-fix-extern-inline-functions.patch
and it can be found in the queue-3.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From foo@baz Sat May 23 13:26:23 PDT 2015
Date: Sat, 23 May 2015 13:26:23 -0700
To: Greg KH <gregkh@linuxfoundation.org>
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: staging: wlags49_h2: fix extern inline functions

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Patch not upstream as this driver is deleted there.

Fix up some "extern inline" functions as they break the build when using
a "modern" complier (i.e. gcc5).

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wlags49_h2/wl_internal.h b/drivers/staging/wlags49_h2/wl_internal.h
index b23078164149..11b00c39a98c 100644
--- a/drivers/staging/wlags49_h2/wl_internal.h
+++ b/drivers/staging/wlags49_h2/wl_internal.h
@@ -1014,7 +1014,7 @@ static inline void wl_unlock(struct wl_private *lp,
 /* Interrupt enable disable functions                               */
 /********************************************************************/
 
-extern inline void wl_act_int_on(struct wl_private *lp)
+static inline void wl_act_int_on(struct wl_private *lp)
 {
 	/*
 	 * Only do something when the driver is handling
@@ -1026,7 +1026,7 @@ extern inline void wl_act_int_on(struct wl_private *lp)
 	}
 }
 
-extern inline void wl_act_int_off(struct wl_private *lp)
+static inline void wl_act_int_off(struct wl_private *lp)
 {
 	/*
 	 * Only do something when the driver is handling


Patches currently in stable-queue which might be from gregkh@linuxfoundation.org are

queue-3.10/staging-rtl8192e-llvmlinux-remove-unused-inline-prototype.patch
queue-3.10/staging-rtl8192e-llvmlinux-change-extern-inline-to-static-inline.patch
queue-3.10/staging-wlags49_h2-fix-extern-inline-functions.patch
queue-3.10/kernel-use-the-gnu89-standard-explicitly.patch
queue-3.10/drm-i915-fix-declaration-of-intel_gmbus_-is_forced_bit-is_port_falid.patch
queue-3.10/staging-rtl8712-rtl8712-avoid-lots-of-build-warnings.patch

Re: Patch "staging: wlags49_h2: fix extern inline functions" has been added to the 3.10-stable tree

[Luis Henriques]

On Sat, May 23, 2015 at 02:07:53PM -0700, Greg Kroah-Hartman wrote:
> 
> This is a note to let you know that I've just added the patch titled
> 
>     staging: wlags49_h2: fix extern inline functions
> 
> to the 3.10-stable tree which can be found at:
>     http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
> 
> The filename of the patch is:
>      staging-wlags49_h2-fix-extern-inline-functions.patch
> and it can be found in the queue-3.10 subdirectory.
> 
> If you, or anyone else, feels it should not be added to the stable tree,
> please let <stable@vger.kernel.org> know about it.
> 

Thanks Greg, I'm also queuing this set of compiler-related patches for
the 3.16 kernel as well, including this one that is stable-specific.

Shouldn't c097877319ab ("ARM: 8307/1: psci: move psci firmware calls
out of line") be also include in 3.14?  It's probably not a clean
cherry-pick but seems to be trivial context adjustment.

Cheers,
--
Lu�s

> 
> From foo@baz Sat May 23 13:26:23 PDT 2015
> Date: Sat, 23 May 2015 13:26:23 -0700
> To: Greg KH <gregkh@linuxfoundation.org>
> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Subject: staging: wlags49_h2: fix extern inline functions
> 
> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> 
> Patch not upstream as this driver is deleted there.
> 
> Fix up some "extern inline" functions as they break the build when using
> a "modern" complier (i.e. gcc5).
> 
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> 
> diff --git a/drivers/staging/wlags49_h2/wl_internal.h b/drivers/staging/wlags49_h2/wl_internal.h
> index b23078164149..11b00c39a98c 100644
> --- a/drivers/staging/wlags49_h2/wl_internal.h
> +++ b/drivers/staging/wlags49_h2/wl_internal.h
> @@ -1014,7 +1014,7 @@ static inline void wl_unlock(struct wl_private *lp,
>  /* Interrupt enable disable functions                               */
>  /********************************************************************/
>  
> -extern inline void wl_act_int_on(struct wl_private *lp)
> +static inline void wl_act_int_on(struct wl_private *lp)
>  {
>  	/*
>  	 * Only do something when the driver is handling
> @@ -1026,7 +1026,7 @@ extern inline void wl_act_int_on(struct wl_private *lp)
>  	}
>  }
>  
> -extern inline void wl_act_int_off(struct wl_private *lp)
> +static inline void wl_act_int_off(struct wl_private *lp)
>  {
>  	/*
>  	 * Only do something when the driver is handling
> 
> 
> Patches currently in stable-queue which might be from gregkh@linuxfoundation.org are
> 
> queue-3.10/staging-rtl8192e-llvmlinux-remove-unused-inline-prototype.patch
> queue-3.10/staging-rtl8192e-llvmlinux-change-extern-inline-to-static-inline.patch
> queue-3.10/staging-wlags49_h2-fix-extern-inline-functions.patch
> queue-3.10/kernel-use-the-gnu89-standard-explicitly.patch
> queue-3.10/drm-i915-fix-declaration-of-intel_gmbus_-is_forced_bit-is_port_falid.patch
> queue-3.10/staging-rtl8712-rtl8712-avoid-lots-of-build-warnings.patch
> --
> To unsubscribe from this list: send the line "unsubscribe stable" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Patch "staging: wlags49_h2: fix extern inline functions" has been added to the 3.10-stable tree

[Greg KH]

On Thu, May 28, 2015 at 11:39:36AM +0100, Luis Henriques wrote:
> On Sat, May 23, 2015 at 02:07:53PM -0700, Greg Kroah-Hartman wrote:
> > 
> > This is a note to let you know that I've just added the patch titled
> > 
> >     staging: wlags49_h2: fix extern inline functions
> > 
> > to the 3.10-stable tree which can be found at:
> >     http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
> > 
> > The filename of the patch is:
> >      staging-wlags49_h2-fix-extern-inline-functions.patch
> > and it can be found in the queue-3.10 subdirectory.
> > 
> > If you, or anyone else, feels it should not be added to the stable tree,
> > please let <stable@vger.kernel.org> know about it.
> > 
> 
> Thanks Greg, I'm also queuing this set of compiler-related patches for
> the 3.16 kernel as well, including this one that is stable-specific.
> 
> Shouldn't c097877319ab ("ARM: 8307/1: psci: move psci firmware calls
> out of line") be also include in 3.14?  It's probably not a clean
> cherry-pick but seems to be trivial context adjustment.

As I don't care about ARM builds, I don't know, I'll wait for someone to
complain about it before I queue it up :)

greg k-h