diff options
author | 2009-01-11 03:41:39 +0100 | |
---|---|---|
committer | 2009-01-11 03:41:39 +0100 | |
commit | abede81c4fb2e3b85d8760f25e3da39d2c69a134 (patch) | |
tree | 26c893ec108d837eb9171d678c55a1cea7b22af4 /kernel/irq | |
parent | rcu: fix bug in rcutorture system-shutdown code (diff) | |
parent | Linux 2.6.29-rc1 (diff) | |
download | wireguard-linux-abede81c4fb2e3b85d8760f25e3da39d2c69a134.tar.xz wireguard-linux-abede81c4fb2e3b85d8760f25e3da39d2c69a134.zip |
Merge commit 'v2.6.29-rc1' into core/urgent
Diffstat (limited to 'kernel/irq')
-rw-r--r-- | kernel/irq/autoprobe.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/irq/autoprobe.c b/kernel/irq/autoprobe.c index cc0f7321b8ce..1de9700f416e 100644 --- a/kernel/irq/autoprobe.c +++ b/kernel/irq/autoprobe.c @@ -10,6 +10,7 @@ #include <linux/module.h> #include <linux/interrupt.h> #include <linux/delay.h> +#include <linux/async.h> #include "internals.h" @@ -34,6 +35,10 @@ unsigned long probe_irq_on(void) unsigned int status; int i; + /* + * quiesce the kernel, or at least the asynchronous portion + */ + async_synchronize_full(); mutex_lock(&probing_active); /* * something may have generated an irq long ago and we want to |