aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/arch/x86/kernel/apic/vector.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-04-29 11:55:04 +0200
committerIngo Molnar <mingo@kernel.org>2016-04-29 11:55:04 +0200
commitffc5fce9a96303c3e16232a6bdf8827af6adb604 (patch)
treec8c46b2af268d27e07ee7fad8c283fa7d31b1fb7 /arch/x86/kernel/apic/vector.c
parentMerge branch 'x86/urgent' into x86/asm, to fix semantic conflict (diff)
parentx86/apic: Handle zero vector gracefully in clear_vector_irq() (diff)
downloadwireguard-linux-ffc5fce9a96303c3e16232a6bdf8827af6adb604.tar.xz
wireguard-linux-ffc5fce9a96303c3e16232a6bdf8827af6adb604.zip
Merge branch 'x86/urgent' into x86/asm, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/apic/vector.c')
-rw-r--r--arch/x86/kernel/apic/vector.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c
index 26d3ccc63e40..a5e400afc563 100644
--- a/arch/x86/kernel/apic/vector.c
+++ b/arch/x86/kernel/apic/vector.c
@@ -256,7 +256,8 @@ static void clear_irq_vector(int irq, struct apic_chip_data *data)
struct irq_desc *desc;
int cpu, vector;
- BUG_ON(!data->cfg.vector);
+ if (!data->cfg.vector)
+ return;
vector = data->cfg.vector;
for_each_cpu_and(cpu, data->domain, cpu_online_mask)