]>
Commit | Line | Data |
---|---|---|
2380c486 JR |
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 | |
3 | @@ -30,9 +30,9 @@ | |
4 | #include <linux/delay.h> | |
5 | #include <linux/smp.h> | |
6 | #include <linux/security.h> | |
7 | +#include <linux/suspend.h> | |
8 | #include <linux/bootmem.h> | |
9 | #include <linux/syscalls.h> | |
10 | -#include <linux/suspend.h> | |
9474138d | 11 | #include <linux/kexec.h> |
2380c486 JR |
12 | |
13 | #include <asm/uaccess.h> | |
2380c486 JR |
14 | --- e/include/linux/fs.h 2008-05-07 11:39:56.000000000 +0000 |
15 | +++ e/include/linux/fs.h 2008-05-07 11:43:49.907309587 +0000 | |
6df19fe7 | 16 | @@ -207,11 +207,14 @@ |
2380c486 JR |
17 | #define MS_KERNMOUNT (1<<22) /* this is a kern_mount call */ |
18 | #define MS_I_VERSION (1<<23) /* Update inode I_version field */ | |
9474138d AM |
19 | #define MS_STRICTATIME (1<<24) /* Always perform atime updates */ |
20 | -#define MS_FROZEN (1<<25) /* Frozen by freeze_filesystems() */ | |
6df19fe7 | 21 | #define MS_BORN (1<<29) |
2380c486 JR |
22 | #define MS_ACTIVE (1<<30) |
23 | #define MS_NOUSER (1<<31) | |
24 | ||
9474138d AM |
25 | + |
26 | + | |
6df19fe7 | 27 | +#define MS_FROZEN (1<<28) /* Frozen by freeze_filesystems() */ |
9474138d | 28 | + |
2380c486 JR |
29 | /* |
30 | * Superblock flags that can be altered by MS_REMOUNT | |
31 | */ | |
9474138d AM |
32 | |
33 | --- e/include/linux/fs.h.orig 2009-07-20 14:35:32.000000000 +0200 | |
34 | +++ e/include/linux/fs.h 2009-07-20 14:37:27.086666353 +0200 | |
35 | @@ -230,6 +230,8 @@ | |
36 | ||
37 | /* Inode flags - they have nothing to superblock flags now */ | |
38 | ||
39 | +#define S_ATOMIC_COPY 2048 /* Pages mapped with this inode need to be | |
40 | + atomically copied (gem) */ | |
41 | #define S_SYNC 1 /* Writes are synced at once */ | |
42 | #define S_NOATIME 2 /* Do not update access times */ | |
43 | #define S_APPEND 4 /* Append-only file */ | |
44 | @@ -240,8 +242,6 @@ | |
45 | #define S_NOCMTIME 128 /* Do not update file c/mtime */ | |
46 | #define S_SWAPFILE 256 /* Do not truncate: swapon got its bmaps */ | |
47 | #define S_PRIVATE 512 /* Inode is fs-internal */ | |
48 | -#define S_ATOMIC_COPY 1024 /* Pages mapped with this inode need to be | |
49 | - atomically copied (gem) */ | |
50 | ||
51 | /* | |
52 | * Note that nosuid etc flags are inode-specific: setting some file-system | |
53 |