[PATCH] severing module.h->sched.h

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

[PATCH] severing module.h->sched.h
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Al Viro
1 parent 2b5f6dcce5
Showing 16 changed files with 29 additions and 14 deletions Side-by-side Diff
arch/i386/kernel/alternative.c
arch/i386/kernel/cpu/mcheck/therm_throt.c
drivers/base/cpu.c
drivers/hwmon/abituguru.c
drivers/leds/ledtrig-ide-disk.c
drivers/leds/ledtrig-timer.c
drivers/pci/access.c
drivers/scsi/scsi_transport_sas.c
drivers/w1/slaves/w1_therm.c
include/asm-x86_64/elf.h
include/linux/acct.h
include/linux/module.h
include/scsi/libiscsi.h
kernel/latency.c
kernel/module.c
lib/random32.c
 #include <linux/module.h>
+#include <linux/sched.h>
 #include <linux/spinlock.h>
 #include <linux/list.h>
 #include <asm/alternative.h>
@@ -20,6 +20,7 @@
 #include <linux/cpu.h>
 #include <asm/cpu.h>
 #include <linux/notifier.h>
+#include <linux/jiffies.h>
 #include <asm/therm_throt.h>
  
 /* How long to wait between reporting thermal events */
@@ -5,6 +5,7 @@
 #include <linux/sysdev.h>
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/sched.h>
 #include <linux/cpu.h>
 #include <linux/topology.h>
 #include <linux/device.h>
@@ -21,6 +21,7 @@
     etc voltage & frequency control is not supported!
 */
 #include <linux/module.h>
+#include <linux/sched.h>
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/jiffies.h>
@@ -12,6 +12,7 @@
  */
  
 #include <linux/module.h>
+#include <linux/jiffies.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/timer.h>
@@ -12,6 +12,7 @@
  */
  
 #include <linux/module.h>
+#include <linux/jiffies.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/pci.h>
 #include <linux/module.h>
+#include <linux/sched.h>
 #include <linux/ioport.h>
 #include <linux/wait.h>
  
@@ -25,6 +25,7 @@
  
 #include <linux/init.h>
 #include <linux/module.h>
+#include <linux/jiffies.h>
 #include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/string.h>
@@ -24,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/sched.h>
 #include <linux/device.h>
 #include <linux/types.h>
 #include <linux/delay.h>
@@ -45,7 +45,6 @@
  
 #ifdef __KERNEL__
 #include <asm/processor.h>
-#include <asm/compat.h>
  
 /*
  * This is used to ensure we don't load something for the wrong architecture.
@@ -119,6 +119,7 @@
 #ifdef CONFIG_BSD_PROCESS_ACCT
 struct vfsmount;
 struct super_block;
+struct pacct_struct;
 extern void acct_auto_close_mnt(struct vfsmount *m);
 extern void acct_auto_close(struct super_block *sb);
 extern void acct_init_pacct(struct pacct_struct *pacct);
@@ -6,7 +6,6 @@
  * Rewritten by Richard Henderson <rth@tamu.edu> Dec 1996
  * Rewritten again by Rusty Russell, 2002
  */
-#include <linux/sched.h>
 #include <linux/spinlock.h>
 #include <linux/list.h>
 #include <linux/stat.h>
@@ -411,17 +410,7 @@
 	return ret;
 }
  
-static inline void module_put(struct module *module)
-{
-	if (module) {
-		unsigned int cpu = get_cpu();
-		local_dec(&module->ref[cpu].count);
-		/* Maybe they're waiting for us to drop reference? */
-		if (unlikely(!module_is_live(module)))
-			wake_up_process(module->waiter);
-		put_cpu();
-	}
-}
+extern void module_put(struct module *module);
  
 #else /*!CONFIG_MODULE_UNLOAD*/
 static inline int try_module_get(struct module *module)
@@ -25,6 +25,8 @@
  
 #include <linux/types.h>
 #include <linux/mutex.h>
+#include <linux/timer.h>
+#include <linux/workqueue.h>
 #include <scsi/iscsi_proto.h>
 #include <scsi/iscsi_if.h>
  
@@ -36,6 +36,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/notifier.h>
+#include <linux/jiffies.h>
 #include <asm/atomic.h>
  
 struct latency_info {
@@ -34,10 +34,10 @@
 #include <linux/err.h>
 #include <linux/vermagic.h>
 #include <linux/notifier.h>
+#include <linux/sched.h>
 #include <linux/stop_machine.h>
 #include <linux/device.h>
 #include <linux/string.h>
-#include <linux/sched.h>
 #include <linux/mutex.h>
 #include <linux/unwind.h>
 #include <asm/uaccess.h>
@@ -789,6 +789,19 @@
 	.attr = { .name = "refcnt", .mode = 0444, .owner = THIS_MODULE },
 	.show = show_refcnt,
 };
+
+void module_put(struct module *module)
+{
+	if (module) {
+		unsigned int cpu = get_cpu();
+		local_dec(&module->ref[cpu].count);
+		/* Maybe they're waiting for us to drop reference? */
+		if (unlikely(!module_is_live(module)))
+			wake_up_process(module->waiter);
+		put_cpu();
+	}
+}
+EXPORT_SYMBOL(module_put);
  
 #else /* !CONFIG_MODULE_UNLOAD */
 static void print_unload_info(struct seq_file *m, struct module *mod)
@@ -36,6 +36,7 @@
 #include <linux/types.h>
 #include <linux/percpu.h>
 #include <linux/module.h>
+#include <linux/jiffies.h>
 #include <linux/random.h>
  
 struct rnd_state {
1	1	#include <linux/module.h>
	2	+#include <linux/sched.h>
2	3	#include <linux/spinlock.h>
3	4	#include <linux/list.h>
4	5	#include <asm/alternative.h>
...	...	@@ -20,6 +20,7 @@
20	20	#include <linux/cpu.h>
21	21	#include <asm/cpu.h>
22	22	#include <linux/notifier.h>
	23	+#include <linux/jiffies.h>
23	24	#include <asm/therm_throt.h>
24	25
25	26	/* How long to wait between reporting thermal events */
...	...	@@ -5,6 +5,7 @@
5	5	#include <linux/sysdev.h>
6	6	#include <linux/module.h>
7	7	#include <linux/init.h>
	8	+#include <linux/sched.h>
8	9	#include <linux/cpu.h>
9	10	#include <linux/topology.h>
10	11	#include <linux/device.h>
...	...	@@ -21,6 +21,7 @@
21	21	etc voltage & frequency control is not supported!
22	22	*/
23	23	#include <linux/module.h>
	24	+#include <linux/sched.h>
24	25	#include <linux/init.h>
25	26	#include <linux/slab.h>
26	27	#include <linux/jiffies.h>
...	...	@@ -12,6 +12,7 @@
12	12	*/
13	13
14	14	#include <linux/module.h>
	15	+#include <linux/jiffies.h>
15	16	#include <linux/kernel.h>
16	17	#include <linux/init.h>
17	18	#include <linux/timer.h>
1	1	#include <linux/pci.h>
2	2	#include <linux/module.h>
	3	+#include <linux/sched.h>
3	4	#include <linux/ioport.h>
4	5	#include <linux/wait.h>
5	6
...	...	@@ -25,6 +25,7 @@
25	25
26	26	#include <linux/init.h>
27	27	#include <linux/module.h>
	28	+#include <linux/jiffies.h>
28	29	#include <linux/err.h>
29	30	#include <linux/slab.h>
30	31	#include <linux/string.h>
...	...	@@ -24,6 +24,7 @@
24	24	#include <linux/kernel.h>
25	25	#include <linux/module.h>
26	26	#include <linux/moduleparam.h>
	27	+#include <linux/sched.h>
27	28	#include <linux/device.h>
28	29	#include <linux/types.h>
29	30	#include <linux/delay.h>
...	...	@@ -45,7 +45,6 @@
45	45
46	46	#ifdef __KERNEL__
47	47	#include <asm/processor.h>
48		-#include <asm/compat.h>
49	48
50	49	/*
51	50	* This is used to ensure we don't load something for the wrong architecture.
...	...	@@ -119,6 +119,7 @@
119	119	#ifdef CONFIG_BSD_PROCESS_ACCT
120	120	struct vfsmount;
121	121	struct super_block;
	122	+struct pacct_struct;
122	123	extern void acct_auto_close_mnt(struct vfsmount *m);
123	124	extern void acct_auto_close(struct super_block *sb);
124	125	extern void acct_init_pacct(struct pacct_struct *pacct);