Skip to contentSkip to conversation

x86/tsc: Move inline keyword to the beginning of function declarations

PATCH New Mathieu Malaterre 2 participants 2 messages May 24, 2019 – Jun 14, 2019

Subsystems (2)
x86 Kernel janitors
lore
Share & tools
lore

Mathieu Malaterre

author
#0 lore raw

PATCH 1/1 x86/tsc: Move inline keyword to the beginning of function declarations

The inline keyword was not at the beginning of the function declarations. Fix the following warnings triggered when using W=1:

arch/x86/kernel/tsc.c:62:1: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration] arch/x86/kernel/tsc.c:79:1: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration]

Cc Peter Zijlstra <[email protected]>
Signed-off-by Mathieu Malaterre <[email protected]>
---
 arch/x86/kernel/tsc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/tsc.c +2 -2
index 0b29e58f288e..75a41bddbc9d 100644
@@ -59,7 +59,7 @@ struct cyc2ns {
 
 static DEFINE_PER_CPU_ALIGNED(struct cyc2ns, cyc2ns);
 
-void __always_inline cyc2ns_read_begin(struct cyc2ns_data *data)
+__always_inline void cyc2ns_read_begin(struct cyc2ns_data *data)
 {
 	int seq, idx;
 

@@ -76,7 +76,7 @@ void __always_inline cyc2ns_read_begin(struct cyc2ns_data *data)
 	} while (unlikely(seq != this_cpu_read(cyc2ns.seq.sequence)));
 }
 
-void __always_inline cyc2ns_read_end(void)
+__always_inline void cyc2ns_read_end(void)
 {
 	preempt_enable_notrace();
 }
Signature · 1 line
2.20.1
merge bot
#1 lore raw
x86/tsc: Move inline keyword to the beginning of function declarations
Commit-ID:  83e837269e87436fda1cbf82214a5494fb6b35b1
Gitweb:     https://git.kernel.org/tip/83e837269e87436fda1cbf82214a5494fb6b35b1
Author:     Mathieu Malaterre <[email protected]>
AuthorDate: Fri, 24 May 2019 12:32:51 +0200
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Fri, 14 Jun 2019 17:02:09 +0200

x86/tsc: Move inline keyword to the beginning of function declarations

The inline keyword was not at the beginning of the function declarations. Fix the following warnings triggered when using W=1:

arch/x86/kernel/tsc.c:62:1: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration] arch/x86/kernel/tsc.c:79:1: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration]

Signed-off-by Mathieu Malaterre <[email protected]>
Signed-off-by Thomas Gleixner <[email protected]>
Cc [email protected]
Cc [email protected]
Cc Peter Zijlstra <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Link https://lkml.kernel.org/r/[email protected] open here
---
 arch/x86/kernel/tsc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/tsc.c +2 -2
index 0b29e58f288e..75a41bddbc9d 100644
@@ -59,7 +59,7 @@ struct cyc2ns {
 
 static DEFINE_PER_CPU_ALIGNED(struct cyc2ns, cyc2ns);
 
-void __always_inline cyc2ns_read_begin(struct cyc2ns_data *data)
+__always_inline void cyc2ns_read_begin(struct cyc2ns_data *data)
 {
 	int seq, idx;
 

@@ -76,7 +76,7 @@ void __always_inline cyc2ns_read_begin(struct cyc2ns_data *data)
 	} while (unlikely(seq != this_cpu_read(cyc2ns.seq.sequence)));
 }
 
-void __always_inline cyc2ns_read_end(void)
+__always_inline void cyc2ns_read_end(void)
 {
 	preempt_enable_notrace();
 }