Merge branch 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit 8d517bdfb571 · 2017-12-31T12:29:02.000-08:00
Pull smp fixlet from Thomas Gleixner:
 "A trivial build warning fix for newer compilers"

* 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  cpu/hotplug: Move inline keyword at the beginning of declaration
diff --git a/kernel/cpu.c b/kernel/cpu.c
@@ -80,19 +80,19 @@ static struct lockdep_map cpuhp_state_down_map =
 	STATIC_LOCKDEP_MAP_INIT("cpuhp_state-down", &cpuhp_state_down_map);
 
 
-static void inline cpuhp_lock_acquire(bool bringup)
+static inline void cpuhp_lock_acquire(bool bringup)
 {
 	lock_map_acquire(bringup ? &cpuhp_state_up_map : &cpuhp_state_down_map);
 }
 
-static void inline cpuhp_lock_release(bool bringup)
+static inline void cpuhp_lock_release(bool bringup)
 {
 	lock_map_release(bringup ? &cpuhp_state_up_map : &cpuhp_state_down_map);
 }
 #else
 
-static void inline cpuhp_lock_acquire(bool bringup) { }
-static void inline cpuhp_lock_release(bool bringup) { }
+static inline void cpuhp_lock_acquire(bool bringup) { }
+static inline void cpuhp_lock_release(bool bringup) { }
 
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -80,19 +80,19 @@ static struct lockdep_map cpuhp_state_down_map =`
`80`	`80`	`STATIC_LOCKDEP_MAP_INIT("cpuhp_state-down", &cpuhp_state_down_map);`
`81`	`81`
`82`	`82`
`83`		`-static void inline cpuhp_lock_acquire(bool bringup)`
	`83`	`+static inline void cpuhp_lock_acquire(bool bringup)`
`84`	`84`	`{`
`85`	`85`	`lock_map_acquire(bringup ? &cpuhp_state_up_map : &cpuhp_state_down_map);`
`86`	`86`	`}`
`87`	`87`
`88`		`-static void inline cpuhp_lock_release(bool bringup)`
	`88`	`+static inline void cpuhp_lock_release(bool bringup)`
`89`	`89`	`{`
`90`	`90`	`lock_map_release(bringup ? &cpuhp_state_up_map : &cpuhp_state_down_map);`
`91`	`91`	`}`
`92`	`92`	`#else`
`93`	`93`
`94`		`-static void inline cpuhp_lock_acquire(bool bringup) { }`
`95`		`-static void inline cpuhp_lock_release(bool bringup) { }`
	`94`	`+static inline void cpuhp_lock_acquire(bool bringup) { }`
	`95`	`+static inline void cpuhp_lock_release(bool bringup) { }`
`96`	`96`
`97`	`97`	`#endif`
`98`	`98`