leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Pull timer fix from Ingo Molnar:
 "Fix for a misplaced export that can cause build failures in certain
  (rare) Kconfig situations"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  tick: Move the export of tick_broadcast_oneshot_control to the proper place
This commit is contained in:
Linus Torvalds 2015-07-18 10:49:11 -07:00
commit dae57fb64e
2 changed files with 1 additions and 1 deletions

1
kernel/time/tick-broadcast.c
View File

@ -839,7 +839,6 @@ out:
raw_spin_unlock(&tick_broadcast_lock); raw_spin_unlock(&tick_broadcast_lock);
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(tick_broadcast_oneshot_control);
/* /*
* Reset the one shot broadcast for a cpu * Reset the one shot broadcast for a cpu

1
kernel/time/tick-common.c
View File

@ -363,6 +363,7 @@ int tick_broadcast_oneshot_control(enum tick_broadcast_state state)
return __tick_broadcast_oneshot_control(state); return __tick_broadcast_oneshot_control(state);
} }
EXPORT_SYMBOL_GPL(tick_broadcast_oneshot_control);
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
/* /*