1 --- a/kernel/printk.c 2007-10-02 14:01:04.780023500 +0200
2 +++ b/kernel/printk.c 2007-10-02 14:09:40.140231500 +0200
4 #include <linux/delay.h>
6 #include <linux/security.h>
7 +#include <linux/suspend.h>
8 #include <linux/bootmem.h>
9 #include <linux/memblock.h>
10 #include <linux/syscalls.h>
11 -#include <linux/suspend.h>
12 #include <linux/kexec.h>
13 #include <linux/kdb.h>
14 #include <linux/ratelimit.h>
15 --- a/include/linux/fs.h 2008-05-07 11:39:56.000000000 +0000
16 +++ b/include/linux/fs.h 2008-05-07 11:43:49.907309587 +0000
18 #define MS_KERNMOUNT (1<<22) /* this is a kern_mount call */
19 #define MS_I_VERSION (1<<23) /* Update inode I_version field */
20 #define MS_STRICTATIME (1<<24) /* Always perform atime updates */
21 -#define MS_FROZEN (1<<25) /* Frozen by freeze_filesystems() */
22 #define MS_NOSEC (1<<28)
23 #define MS_BORN (1<<29)
24 #define MS_ACTIVE (1<<30)
25 #define MS_NOUSER (1<<31)
29 +#define MS_FROZEN (1<<27) /* Frozen by freeze_filesystems() */
32 * Superblock flags that can be altered by MS_REMOUNT
36 /* Inode flags - they have nothing to superblock flags now */
38 +#define S_ATOMIC_COPY 8192 /* Pages mapped with this inode need to be
39 + atomically copied (gem) */
40 #define S_SYNC 1 /* Writes are synced at once */
41 #define S_NOATIME 2 /* Do not update access times */
42 #define S_APPEND 4 /* Append-only file */
44 #define S_IMA 1024 /* Inode has an associated IMA struct */
45 #define S_AUTOMOUNT 2048 /* Automount/referral quasi-directory */
46 #define S_NOSEC 4096 /* no suid or xattr security attributes */
47 -#define S_ATOMIC_COPY 8192 /* Pages mapped with this inode need to be
48 - atomically copied (gem) */
51 * Note that nosuid etc flags are inode-specific: setting some file-system