Re: [PATCH -next] x86/jump_label: Fix old-style declaration

[Borislav Petkov]

On Wed, Dec 25, 2019 at 07:45:00PM +0800, YueHaibing wrote:
> Fix gcc warning:
> 
> arch/x86/kernel/jump_label.c:61:1: warning:
>  inline is not at beginning of declaration [-Wold-style-declaration]
> 
> Signed-off-by: YueHaibing <yuehaibing@xxxxxxxxxx>
> ---
>  arch/x86/kernel/jump_label.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
> index 9c4498e..5ba8477 100644
> --- a/arch/x86/kernel/jump_label.c
> +++ b/arch/x86/kernel/jump_label.c
> @@ -58,7 +58,7 @@ __jump_label_set_jump_code(struct jump_entry *entry, enum jump_label_type type,
>  	return code;
>  }
>  
> -static void inline __jump_label_transform(struct jump_entry *entry,
> +static inline void __jump_label_transform(struct jump_entry *entry,
>  					  enum jump_label_type type,
>  					  int init)
>  {
> -- 

Looks not needed anymore:

$ test-apply.sh /tmp/yuehaibing.01
checking file arch/x86/kernel/jump_label.c
Hunk #1 FAILED at 58.
1 out of 1 hunk FAILED
Apply? (y/n) n
--merge? (y/n) y
patching file arch/x86/kernel/jump_label.c
Hunk #1 NOT MERGED at 67-71.
$ git diff
diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
index c1a8b9e71408..0a9e1dc65a3f 100644
--- a/arch/x86/kernel/jump_label.c
+++ b/arch/x86/kernel/jump_label.c
@@ -64,7 +64,11 @@ static void __jump_label_set_jump_code(struct jump_entry *entry,
                memcpy(code, ideal_nop, JUMP_LABEL_NOP_SIZE);
 }
 
+<<<<<<<
 static void __ref __jump_label_transform(struct jump_entry *entry,
+=======
+static inline void __jump_label_transform(struct jump_entry *entry,
+>>>>>>>
                                         enum jump_label_type type,
                                         int init)
 {

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette