diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-11 20:04:41 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-11 20:04:41 -0500 |
| commit | ef1417a5a6a400dbc1a2f44da716ab146a29ddc4 (patch) | |
| tree | dffb9cfa77d00d149b3a9ff829c1baa8db50ec43 /kernel/irq/manage.c | |
| parent | 1006fae359cc810c16354805c0cffbb6ffee602e (diff) | |
| parent | bbfe65c219c638e19f1da5adab1005b2d68ca810 (diff) | |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull leftover IRQ fixes from Ingo Molnar:
"Two (minor) fixlets that missed v3.12"
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
genirq: Set the irq thread policy without checking CAP_SYS_NICE
irq: DocBook/genericirq.tmpl: Correct various typos
Diffstat (limited to 'kernel/irq/manage.c')
| -rw-r--r-- | kernel/irq/manage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 514bcfd855a8..3e59f951d42f 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
| @@ -956,7 +956,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) | |||
| 956 | goto out_mput; | 956 | goto out_mput; |
| 957 | } | 957 | } |
| 958 | 958 | ||
| 959 | sched_setscheduler(t, SCHED_FIFO, ¶m); | 959 | sched_setscheduler_nocheck(t, SCHED_FIFO, ¶m); |
| 960 | 960 | ||
| 961 | /* | 961 | /* |
| 962 | * We keep the reference to the task struct even if | 962 | * We keep the reference to the task struct even if |