Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d517bdf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents 4c470317 76dc6c09

kernel/cpu.c

+4 −4
Original line number Diff line number Diff line
@@ -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