History

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

Pull smpboot bugfix from Thomas Gleixner: "A single bugfix for a regression introduced with the conversion of the stop machine threads to the generic smpboot thread management facility" * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: stop_machine: Mark per cpu stopper enabled early

Linus Torvalds committed 13 years ago

Commit 6516ab62 parents 06e79d3 46c498c3 files · +7 −1Browse files

Showing the changes to include (1 of 3 files). Show all

Unified · Split

include/linux/smpboot.h+4−0
@@ -24,6 +24,9 @@ struct smpboot_thread_data; · 23 unmodified lines
24 * parked (cpu offline)24 * parked (cpu offline)
25 * @unpark: Optional unpark function, called when the thread is25 * @unpark: Optional unpark function, called when the thread is
26 * unparked (cpu online)26 * unparked (cpu online)
27 * @pre_unpark: Optional unpark function, called before the thread is
28 * unparked (cpu online). This is not guaranteed to be
29 * called on the target cpu of the thread. Careful!
27 * @selfparking: Thread is not parked by the park function.30 * @selfparking: Thread is not parked by the park function.
28 * @thread_comm: The base name of the thread31 * @thread_comm: The base name of the thread
29 */32 */
@@ -37,6 +40,7 @@ struct smp_hotplug_thread { · 7 unmodified lines
37 void (*cleanup)(unsigned int cpu, bool online);40 void (*cleanup)(unsigned int cpu, bool online);
38 void (*park)(unsigned int cpu);41 void (*park)(unsigned int cpu);
39 void (*unpark)(unsigned int cpu);42 void (*unpark)(unsigned int cpu);
43 void (*pre_unpark)(unsigned int cpu);
40 bool selfparking;44 bool selfparking;
41 const char *thread_comm;45 const char *thread_comm;
42};46};

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t