summaryrefslogtreecommitdiffstats
path: root/arch/x86/platform
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-06-15 14:16:54 +0200
committerIngo Molnar <mingo@kernel.org>2012-06-15 14:17:01 +0200
commit879060d5745250c6f38304fd548d42b76f9df093 (patch)
treef28ad110cb52cc2b4f93aeb552ceb54317efbbfb /arch/x86/platform
parent5a0a2a308113086cc800a203d903271c9caa1611 (diff)
parentfbd24153c48b8425b09c161a020483cd77da870e (diff)
Merge branch 'x86/cleanups' into x86/apic
Merge in the cleanups because a followup x86/apic change relies on them. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/platform')
-rw-r--r--arch/x86/platform/uv/uv_irq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/platform/uv/uv_irq.c b/arch/x86/platform/uv/uv_irq.c
index a67c7a6bac7..acf7752da95 100644
--- a/arch/x86/platform/uv/uv_irq.c
+++ b/arch/x86/platform/uv/uv_irq.c
@@ -227,7 +227,7 @@ uv_set_irq_affinity(struct irq_data *data, const struct cpumask *mask,
if (cfg->move_in_progress)
send_cleanup_vector(cfg);
- return 0;
+ return IRQ_SET_MASK_OK_NOCOPY;
}
/*