diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-06-15 08:16:54 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-06-15 08:17:01 -0400 |
| commit | 879060d5745250c6f38304fd548d42b76f9df093 (patch) | |
| tree | f28ad110cb52cc2b4f93aeb552ceb54317efbbfb /arch/x86/platform | |
| parent | 5a0a2a308113086cc800a203d903271c9caa1611 (diff) | |
| parent | fbd24153c48b8425b09c161a020483cd77da870e (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.c | 2 |
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 a67c7a6bac7e..acf7752da952 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, | |||
| 227 | if (cfg->move_in_progress) | 227 | if (cfg->move_in_progress) |
| 228 | send_cleanup_vector(cfg); | 228 | send_cleanup_vector(cfg); |
| 229 | 229 | ||
| 230 | return 0; | 230 | return IRQ_SET_MASK_OK_NOCOPY; |
| 231 | } | 231 | } |
| 232 | 232 | ||
| 233 | /* | 233 | /* |