History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

David S. Miller committed 7 years ago

Commit eaf2a472 parents c829f5f 629678978 files · +755 −284Browse files

Showing the changes to include/linux (2 of 78 files). Show all

Unified · Split

2 files
  1. include/linux/interrupt.h +1 −0
  2. include/linux/sched/wake_q.h +5 −1
include/linux/interrupt.h+1−0
@@ -260,6 +260,7 @@ struct irq_affinity { · 259 unmodified lines
260/**260/**
261 * struct irq_affinity_desc - Interrupt affinity descriptor261 * struct irq_affinity_desc - Interrupt affinity descriptor
262 * @mask: cpumask to hold the affinity assignment262 * @mask: cpumask to hold the affinity assignment
263 * @is_managed: 1 if the interrupt is managed internally
263 */264 */
264struct irq_affinity_desc {265struct irq_affinity_desc {
265 struct cpumask mask;266 struct cpumask mask;
include/linux/sched/wake_q.h+5−1
@@ -24,9 +24,13 @@ · 23 unmodified lines
24 * called near the end of a function. Otherwise, the list can be24 * called near the end of a function. Otherwise, the list can be
25 * re-initialized for later re-use by wake_q_init().25 * re-initialized for later re-use by wake_q_init().
26 *26 *
27 * Note that this can cause spurious wakeups. schedule() callers27 * NOTE that this can cause spurious wakeups. schedule() callers
28 * must ensure the call is done inside a loop, confirming that the28 * must ensure the call is done inside a loop, confirming that the
29 * wakeup condition has in fact occurred.29 * wakeup condition has in fact occurred.
30 *
31 * NOTE that there is no guarantee the wakeup will happen any later than the
32 * wake_q_add() location. Therefore task must be ready to be woken at the
33 * location of the wake_q_add().
30 */34 */
31 35
32#include <linux/sched.h>36#include <linux/sched.h>

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