diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2017-05-02 11:02:41 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-05-02 11:02:41 +0200 |
| commit | 4d6ca227c768b50b05cf183974b40abe444e9d0c (patch) | |
| tree | bf953d8e895281053548b9967a2c4b58d641df00 /kernel/irq/manage.c | |
| parent | Merge branch 'for-4.12/sony' into for-linus (diff) | |
| parent | HID: asus: support backlight on USB keyboards (diff) | |
| download | wireguard-linux-4d6ca227c768b50b05cf183974b40abe444e9d0c.tar.xz wireguard-linux-4d6ca227c768b50b05cf183974b40abe444e9d0c.zip | |
Merge branch 'for-4.12/asus' into for-linus
Diffstat (limited to '')
| -rw-r--r-- | kernel/irq/manage.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 6b669593e7eb..a4afe5cc5af1 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -17,6 +17,8 @@ #include <linux/slab.h> #include <linux/sched.h> #include <linux/sched/rt.h> +#include <linux/sched/task.h> +#include <uapi/linux/sched/types.h> #include <linux/task_work.h> #include "internals.h" @@ -353,7 +355,7 @@ static int setup_affinity(struct irq_desc *desc, struct cpumask *mask) return 0; /* - * Preserve the managed affinity setting and an userspace affinity + * Preserve the managed affinity setting and a userspace affinity * setup, but make sure that one of the targets is online. */ if (irqd_affinity_is_managed(&desc->irq_data) || |