Merge branch 'irq/for-block' into irq/core

Pull the irq affinity managing code which is in a seperate branch for block
developers to pull.
This commit is contained in:
Thomas Gleixner
2016-07-04 12:26:05 +02:00
1006 changed files with 9719 additions and 5958 deletions

View File

@@ -96,7 +96,7 @@ static ssize_t write_irq_affinity(int type, struct file *file,
cpumask_var_t new_value;
int err;
if (!irq_can_set_affinity(irq) || no_irq_affinity)
if (!irq_can_set_affinity_usr(irq) || no_irq_affinity)
return -EIO;
if (!alloc_cpumask_var(&new_value, GFP_KERNEL))