diff options
Diffstat (limited to 'drivers/hotplug')
| -rw-r--r-- | drivers/hotplug/cpqphp.h | 2 | ||||
| -rw-r--r-- | drivers/hotplug/cpqphp_core.c | 2 | ||||
| -rw-r--r-- | drivers/hotplug/cpqphp_ctrl.c | 3 | ||||
| -rw-r--r-- | drivers/hotplug/cpqphp_nvram.c | 2 | ||||
| -rw-r--r-- | drivers/hotplug/cpqphp_pci.c | 2 | ||||
| -rw-r--r-- | drivers/hotplug/cpqphp_proc.c | 2 |
6 files changed, 6 insertions, 7 deletions
diff --git a/drivers/hotplug/cpqphp.h b/drivers/hotplug/cpqphp.h index 0be973674055..29b6b47da539 100644 --- a/drivers/hotplug/cpqphp.h +++ b/drivers/hotplug/cpqphp.h @@ -317,7 +317,7 @@ struct controller { u16 vendor_id; char proc_name[20]; char proc_name2[20]; - struct tq_struct int_task_event; + struct work_struct int_task_event; wait_queue_head_t queue; /* sleep & wake process */ }; diff --git a/drivers/hotplug/cpqphp_core.c b/drivers/hotplug/cpqphp_core.c index 4241575713e8..3cb48d075157 100644 --- a/drivers/hotplug/cpqphp_core.c +++ b/drivers/hotplug/cpqphp_core.c @@ -33,7 +33,7 @@ #include <linux/proc_fs.h> #include <linux/miscdevice.h> #include <linux/slab.h> -#include <linux/tqueue.h> +#include <linux/workqueue.h> #include <linux/pci.h> #include <linux/init.h> #include <asm/uaccess.h> diff --git a/drivers/hotplug/cpqphp_ctrl.c b/drivers/hotplug/cpqphp_ctrl.c index d90f7eaee445..4086fe656f3f 100644 --- a/drivers/hotplug/cpqphp_ctrl.c +++ b/drivers/hotplug/cpqphp_ctrl.c @@ -31,7 +31,7 @@ #include <linux/kernel.h> #include <linux/types.h> #include <linux/slab.h> -#include <linux/tqueue.h> +#include <linux/workqueue.h> #include <linux/interrupt.h> #include <linux/delay.h> #include <linux/wait.h> @@ -971,7 +971,6 @@ void cpqhp_ctrl_intr(int IRQ, struct controller * ctrl, struct pt_regs *regs) if (schedule_flag) { up(&event_semaphore); dbg("Signal event_semaphore\n"); - mark_bh(IMMEDIATE_BH); } } diff --git a/drivers/hotplug/cpqphp_nvram.c b/drivers/hotplug/cpqphp_nvram.c index 08dca3fba90c..d8208ca574de 100644 --- a/drivers/hotplug/cpqphp_nvram.c +++ b/drivers/hotplug/cpqphp_nvram.c @@ -33,7 +33,7 @@ #include <linux/proc_fs.h> #include <linux/miscdevice.h> #include <linux/slab.h> -#include <linux/tqueue.h> +#include <linux/workqueue.h> #include <linux/pci.h> #include <linux/init.h> #include <asm/uaccess.h> diff --git a/drivers/hotplug/cpqphp_pci.c b/drivers/hotplug/cpqphp_pci.c index 8b9b16589f3b..22baa9198815 100644 --- a/drivers/hotplug/cpqphp_pci.c +++ b/drivers/hotplug/cpqphp_pci.c @@ -31,7 +31,7 @@ #include <linux/kernel.h> #include <linux/types.h> #include <linux/slab.h> -#include <linux/tqueue.h> +#include <linux/workqueue.h> #include <linux/proc_fs.h> #include <linux/pci.h> #include "cpqphp.h" diff --git a/drivers/hotplug/cpqphp_proc.c b/drivers/hotplug/cpqphp_proc.c index 8912f881664a..e06e929e95f1 100644 --- a/drivers/hotplug/cpqphp_proc.c +++ b/drivers/hotplug/cpqphp_proc.c @@ -31,7 +31,7 @@ #include <linux/kernel.h> #include <linux/types.h> #include <linux/proc_fs.h> -#include <linux/tqueue.h> +#include <linux/workqueue.h> #include <linux/pci.h> #include "cpqphp.h" |