]>
Commit | Line | Data |
---|---|---|
e4a6a92b | 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 | |
1838f965 | 3 | @@ -22,7 +22,6 @@ |
4 | #include <linux/tty_driver.h> | |
5 | #include <linux/console.h> | |
6 | #include <linux/init.h> | |
7 | -#include <linux/jiffies.h> | |
8 | #include <linux/nmi.h> | |
9 | #include <linux/module.h> | |
10 | #include <linux/moduleparam.h> | |
11 | @@ -30,9 +29,10 @@ | |
e4a6a92b | 12 | #include <linux/delay.h> |
13 | #include <linux/smp.h> | |
14 | #include <linux/security.h> | |
15 | +#include <linux/suspend.h> | |
f3e0dcc9 | 16 | +#include <linux/jiffies.h> |
e4a6a92b | 17 | #include <linux/bootmem.h> |
18 | #include <linux/syscalls.h> | |
e4a6a92b | 19 | -#include <linux/suspend.h> |
1838f965 | 20 | |
e4a6a92b | 21 | #include <asm/uaccess.h> |
1838f965 | 22 | |
47872f53 AM |
23 | --- a/kernel/timer.c.org 2008-01-20 11:46:53.931178999 +0100 |
24 | +++ b/kernel/timer.c 2008-01-20 11:47:09.758637482 +0100 | |
25 | @@ -32,13 +32,13 @@ | |
26 | #include <linux/time.h> | |
27 | #include <linux/jiffies.h> | |
28 | #include <linux/posix-timers.h> | |
29 | +#include <linux/notifier.h> | |
30 | +#include <linux/suspend.h> | |
31 | #include <linux/cpu.h> | |
32 | #include <linux/syscalls.h> | |
33 | #include <linux/delay.h> | |
34 | #include <linux/tick.h> | |
35 | #include <linux/kallsyms.h> | |
36 | -#include <linux/notifier.h> | |
37 | -#include <linux/suspend.h> | |
38 | ||
39 | #include <asm/uaccess.h> | |
40 | #include <asm/unistd.h> | |
41 | ||
9e282013 | 42 | --- e/include/linux/fs.h 2008-05-07 11:39:56.000000000 +0000 |
43 | +++ e/include/linux/fs.h 2008-05-07 11:43:49.907309587 +0000 | |
44 | @@ -127,10 +127,10 @@ | |
47872f53 AM |
45 | #define MS_RELATIME (1<<21) /* Update atime relative to mtime/ctime. */ |
46 | #define MS_KERNMOUNT (1<<22) /* this is a kern_mount call */ | |
9e282013 | 47 | #define MS_I_VERSION (1<<23) /* Update inode I_version field */ |
48 | -#define MS_FROZEN (1<<24) /* Frozen by freeze_filesystems() */ | |
47872f53 AM |
49 | #define MS_ACTIVE (1<<30) |
50 | #define MS_NOUSER (1<<31) | |
51 | ||
9e282013 | 52 | +#define MS_FROZEN (1<<29) /* Frozen by freeze_filesystems() */ |
53 | /* | |
54 | * Superblock flags that can be altered by MS_REMOUNT | |
55 | */ |