Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 914e26379decf1fd984b22e51fd2e4209b7a7f1b

Authored by Al Viro
1 parent f6a570333e
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] severing fs.h, radix-tree.h -> sched.h 

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

Showing 22 changed files with 44 additions and 31 deletions Side-by-side Diff

arch/i386/kernel/acpi/cstate.c
Diff comments   View file @ 914e263
... ... @@ -11,6 +11,7 @@
11 11 #include <linux/init.h>
12 12 #include <linux/acpi.h>
13 13 #include <linux/cpu.h>
  14 +#include <linux/sched.h>
14 15  
15 16 #include <acpi/processor.h>
16 17 #include <asm/acpi.h>
... ... @@ -27,6 +27,7 @@
27 27 #include <linux/init.h>
28 28 #include <linux/types.h>
29 29 #include <linux/notifier.h>
  30 +#include <linux/jiffies.h>
30 31 #include <acpi/acpi_bus.h>
31 32 #include <acpi/acpi_drivers.h>
32 33  
drivers/char/hw_random/core.c
Diff comments   View file @ 914e263
... ... @@ -36,6 +36,7 @@
36 36 #include <linux/module.h>
37 37 #include <linux/kernel.h>
38 38 #include <linux/fs.h>
  39 +#include <linux/sched.h>
39 40 #include <linux/init.h>
40 41 #include <linux/miscdevice.h>
41 42 #include <linux/delay.h>
drivers/char/tpm/tpm.h
Diff comments   View file @ 914e263
... ... @@ -22,6 +22,7 @@
22 22 #include <linux/pci.h>
23 23 #include <linux/delay.h>
24 24 #include <linux/fs.h>
  25 +#include <linux/sched.h>
25 26 #include <linux/miscdevice.h>
26 27 #include <linux/platform_device.h>
27 28 #include <linux/io.h>
drivers/hwmon/hdaps.c
Diff comments   View file @ 914e263
... ... @@ -33,6 +33,7 @@
33 33 #include <linux/module.h>
34 34 #include <linux/timer.h>
35 35 #include <linux/dmi.h>
  36 +#include <linux/jiffies.h>
36 37 #include <asm/io.h>
37 38  
38 39 #define HDAPS_LOW_PORT 0x1600 /* first port used by hdaps */
drivers/spi/spi_butterfly.c
Diff comments   View file @ 914e263
... ... @@ -23,6 +23,7 @@
23 23 #include <linux/platform_device.h>
24 24 #include <linux/parport.h>
25 25  
  26 +#include <linux/sched.h>
26 27 #include <linux/spi/spi.h>
27 28 #include <linux/spi/spi_bitbang.h>
28 29 #include <linux/spi/flash.h>
... ... @@ -27,6 +27,7 @@
27 27 #include <linux/module.h>
28 28 #include <linux/errno.h>
29 29 #include <linux/fs.h>
  30 +#include <linux/sched.h>
30 31 #include <linux/idr.h>
31 32 #include <asm/uaccess.h>
32 33 #include "debug.h"
... ... @@ -27,6 +27,7 @@
27 27 #include <linux/module.h>
28 28 #include <linux/errno.h>
29 29 #include <linux/fs.h>
  30 +#include <linux/sched.h>
30 31 #include <linux/idr.h>
31 32  
32 33 #include "debug.h"
... ... @@ -23,6 +23,7 @@
23 23 #include <linux/module.h>
24 24 #include <linux/errno.h>
25 25 #include <linux/fs.h>
  26 +#include <linux/sched.h>
26 27 #include <linux/idr.h>
27 28  
28 29 #include "debug.h"
... ... @@ -26,6 +26,7 @@
26 26 #include <linux/module.h>
27 27 #include <linux/errno.h>
28 28 #include <linux/fs.h>
  29 +#include <linux/sched.h>
29 30 #include <linux/parser.h>
30 31 #include <linux/idr.h>
31 32  
... ... @@ -30,6 +30,7 @@
30 30 #include <linux/stat.h>
31 31 #include <linux/string.h>
32 32 #include <linux/smp_lock.h>
  33 +#include <linux/sched.h>
33 34 #include <linux/inet.h>
34 35 #include <linux/idr.h>
35 36  
... ... @@ -26,6 +26,7 @@
26 26 #include <linux/module.h>
27 27 #include <linux/errno.h>
28 28 #include <linux/fs.h>
  29 +#include <linux/sched.h>
29 30 #include <linux/file.h>
30 31 #include <linux/stat.h>
31 32 #include <linux/string.h>
... ... @@ -27,6 +27,7 @@
27 27 #include <linux/idr.h>
28 28 #include <linux/slab.h>
29 29 #include <linux/fs.h>
  30 +#include <linux/sched.h>
30 31 #include <linux/init.h>
31 32 #include <linux/list.h>
32 33 #include <linux/writeback.h>
... ... @@ -11,6 +11,7 @@
11 11 #include <linux/kernel.h>
12 12 #include <linux/slab.h>
13 13 #include <linux/fs.h>
  14 +#include <linux/sched.h>
14 15 #include <linux/time.h>
15 16 #include <linux/crc32.h>
16 17 #include <linux/jffs2.h>
... ... @@ -19,6 +19,7 @@
19 19 #include <linux/crc32.h>
20 20 #include <linux/mtd/nand.h>
21 21 #include <linux/jiffies.h>
  22 +#include <linux/sched.h>
22 23  
23 24 #include "nodelist.h"
24 25  
... ... @@ -9,6 +9,7 @@
9 9 #include <linux/ctype.h>
10 10 #include <linux/capability.h>
11 11 #include <linux/time.h>
  12 +#include <linux/sched.h>
12 13 #include <asm/current.h>
13 14 #include <asm/uaccess.h>
14 15  
... ... @@ -13,6 +13,7 @@
13 13 #include <linux/proc_fs.h>
14 14 #include <linux/stat.h>
15 15 #include <linux/init.h>
  16 +#include <linux/sched.h>
16 17 #include <linux/module.h>
17 18 #include <linux/bitops.h>
18 19 #include <linux/smp_lock.h>
... ... @@ -221,6 +221,24 @@
221 221 }
222 222  
223 223 /*
  224 + * Superblock locking. We really ought to get rid of these two.
  225 + */
  226 +void lock_super(struct super_block * sb)
  227 +{
  228 + get_fs_excl();
  229 + mutex_lock(&sb->s_lock);
  230 +}
  231 +
  232 +void unlock_super(struct super_block * sb)
  233 +{
  234 + put_fs_excl();
  235 + mutex_unlock(&sb->s_lock);
  236 +}
  237 +
  238 +EXPORT_SYMBOL(lock_super);
  239 +EXPORT_SYMBOL(unlock_super);
  240 +
  241 +/*
224 242 * Write out and wait upon all dirty data associated with this
225 243 * superblock. Filesystem data as well as the underlying block
226 244 * device. Takes the superblock lock. Requires a second blkdev
... ... @@ -6,6 +6,7 @@
6 6 #include <linux/file.h>
7 7 #include <linux/fs.h>
8 8 #include <linux/module.h>
  9 +#include <linux/sched.h>
9 10 #include <linux/writeback.h>
10 11 #include <linux/syscalls.h>
11 12 #include <linux/linkage.h>
... ... @@ -2,6 +2,7 @@
2 2 #include <linux/fs.h>
3 3 #include <linux/linkage.h>
4 4 #include <linux/namei.h>
  5 +#include <linux/sched.h>
5 6 #include <linux/utime.h>
6 7 #include <asm/uaccess.h>
7 8 #include <asm/unistd.h>
... ... @@ -276,7 +276,7 @@
276 276 #include <linux/radix-tree.h>
277 277 #include <linux/prio_tree.h>
278 278 #include <linux/init.h>
279   -#include <linux/sched.h>
  279 +#include <linux/pid.h>
280 280 #include <linux/mutex.h>
281 281  
282 282 #include <asm/atomic.h>
283 283  
... ... @@ -977,36 +977,13 @@
977 977 #define vfs_check_frozen(sb, level) \
978 978 wait_event((sb)->s_wait_unfrozen, ((sb)->s_frozen < (level)))
979 979  
980   -static inline void get_fs_excl(void)
981   -{
982   - atomic_inc(&current->fs_excl);
983   -}
  980 +#define get_fs_excl() atomic_inc(&current->fs_excl)
  981 +#define put_fs_excl() atomic_dec(&current->fs_excl)
  982 +#define has_fs_excl() atomic_read(&current->fs_excl)
984 983  
985   -static inline void put_fs_excl(void)
986   -{
987   - atomic_dec(&current->fs_excl);
988   -}
989   -
990   -static inline int has_fs_excl(void)
991   -{
992   - return atomic_read(&current->fs_excl);
993   -}
994   -
995   -
996   -/*
997   - * Superblock locking.
998   - */
999   -static inline void lock_super(struct super_block * sb)
1000   -{
1001   - get_fs_excl();
1002   - mutex_lock(&sb->s_lock);
1003   -}
1004   -
1005   -static inline void unlock_super(struct super_block * sb)
1006   -{
1007   - put_fs_excl();
1008   - mutex_unlock(&sb->s_lock);
1009   -}
  984 +/* not quite ready to be deprecated, but... */
  985 +extern void lock_super(struct super_block *);
  986 +extern void unlock_super(struct super_block *);
1010 987  
1011 988 /*
1012 989 * VFS helper functions..
include/linux/radix-tree.h
Diff comments   View file @ 914e263
... ... @@ -19,7 +19,6 @@
19 19 #ifndef _LINUX_RADIX_TREE_H
20 20 #define _LINUX_RADIX_TREE_H
21 21  
22   -#include <linux/sched.h>
23 22 #include <linux/preempt.h>
24 23 #include <linux/types.h>
25 24