[PATCH] remove tqueue.h from sched.h

This is actually part of the work I've been doing to remove BHs, but it
stands by itself.

diff --git a/drivers/char/random.c b/drivers/char/random.c
index db20dec287d070150568dbc4b3bf6037ed96cf93..9db52acb9ef2cba521e8e5bb69248efd26691604 100644 (file)
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -252,6 +252,7 @@
 #include <linux/poll.h>
 #include <linux/init.h>
 #include <linux/fs.h>
+#include <linux/tqueue.h>
 
 #include <asm/processor.h>
 #include <asm/uaccess.h>

diff --git a/drivers/pcmcia/pci_socket.c b/drivers/pcmcia/pci_socket.c
index d30df9b4203a389d79cbe412514a77279138e580..5a4b78312391ad626c677a89182b0aba2bcb184f 100644 (file)
--- a/drivers/pcmcia/pci_socket.c
+++ b/drivers/pcmcia/pci_socket.c
@@ -20,6 +20,7 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/sched.h>
+#include <linux/tqueue.h>
 #include <linux/interrupt.h>
 
 #include <pcmcia/ss.h>

diff --git a/drivers/pcmcia/yenta.c b/drivers/pcmcia/yenta.c
index e5453fb455e2a11c2259f511f25076db28b52af9..40b20b945488d6a7b135f72bed40bb5a6145aa34 100644 (file)
--- a/drivers/pcmcia/yenta.c
+++ b/drivers/pcmcia/yenta.c
@@ -6,6 +6,7 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/sched.h>
+#include <linux/tqueue.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/module.h>

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 3b43d3bb11238e3c8e32c81b8d99091b1d512630..9e7d80851c32228b49dbf8b4d3d35c4c0ada5834 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -7,7 +7,6 @@ extern unsigned long event;
 
 #include <linux/config.h>
 #include <linux/capability.h>
-#include <linux/tqueue.h>
 #include <linux/threads.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
@@ -160,7 +159,6 @@ extern unsigned long cache_decay_ticks;
 extern signed long FASTCALL(schedule_timeout(signed long timeout));
 asmlinkage void schedule(void);
 
-extern int schedule_task(struct tq_struct *task);
 extern void flush_scheduled_tasks(void);
 extern int start_context_thread(void);
 extern int current_is_keventd(void);

diff --git a/include/linux/tqueue.h b/include/linux/tqueue.h
index 3d30470272295c806d1ae39c0d5dd85ae76d2360..d4729c518f22565ef19ab8ae6f004c0da4f6e3a7 100644 (file)
--- a/include/linux/tqueue.h
+++ b/include/linux/tqueue.h
@@ -110,6 +110,9 @@ static inline int queue_task(struct tq_struct *bh_pointer, task_queue *bh_list)
        return ret;
 }
 
+/* Schedule a tq to run in process context */
+extern int schedule_task(struct tq_struct *task);
+
 /*
  * Call all "bottom halfs" on a given list.
  */

diff --git a/kernel/context.c b/kernel/context.c
index 56bada438f61ace5611a5110aef6f2f2eeec145f..c49f914430e0dda396ef85faff5ba0a94dae876c 100644 (file)
--- a/kernel/context.c
+++ b/kernel/context.c
@@ -20,6 +20,7 @@
 #include <linux/unistd.h>
 #include <linux/signal.h>
 #include <linux/completion.h>
+#include <linux/tqueue.h>
 
 static DECLARE_TASK_QUEUE(tq_context);
 static DECLARE_WAIT_QUEUE_HEAD(context_task_wq);

diff --git a/kernel/kmod.c b/kernel/kmod.c
index a9f0ddb521cc60aab18400540a6175d9fd04b1bb..05388d9557fa2313f318c9cecf85bcb296f83733 100644 (file)
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -28,6 +28,7 @@
 #include <linux/namespace.h>
 #include <linux/completion.h>
 #include <linux/file.h>
+#include <linux/tqueue.h>
 
 #include <asm/uaccess.h>
 

diff --git a/kernel/sys.c b/kernel/sys.c
index 3bd38f3448179543253b65d5695748b4b2392d88..2ba72b6c87d4eeb50b82ad5458b8c6b65252fa58 100644 (file)
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -16,6 +16,7 @@
 #include <linux/init.h>
 #include <linux/highuid.h>
 #include <linux/fs.h>
+#include <linux/tqueue.h>
 #include <linux/device.h>
 
 #include <asm/uaccess.h>

diff --git a/kernel/timer.c b/kernel/timer.c
index c6d6d12e04d45d4d77b51556822db7c81190070a..ab864eca26458acf1adefc75271eca0e30369f76 100644 (file)
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -22,6 +22,7 @@
 #include <linux/delay.h>
 #include <linux/smp_lock.h>
 #include <linux/interrupt.h>
+#include <linux/tqueue.h>
 #include <linux/kernel_stat.h>
 
 #include <asm/uaccess.h>