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/tty_driver.h>
5 #include <linux/console.h>
6 #include <linux/init.h>
7 -#include <linux/jiffies.h>
9 #include <linux/module.h>
10 #include <linux/moduleparam.h>
12 #include <linux/delay.h>
13 #include <linux/smp.h>
14 #include <linux/security.h>
15 +#include <linux/suspend.h>
16 +#include <linux/jiffies.h>
17 #include <linux/bootmem.h>
18 #include <linux/syscalls.h>
19 -#include <linux/suspend.h>
21 #include <asm/uaccess.h>
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
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>
39 #include <asm/uaccess.h>
40 #include <asm/unistd.h>
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
45 #define MS_RELATIME (1<<21) /* Update atime relative to mtime/ctime. */
46 #define MS_KERNMOUNT (1<<22) /* this is a kern_mount call */
47 #define MS_I_VERSION (1<<23) /* Update inode I_version field */
48 -#define MS_FROZEN (1<<24) /* Frozen by freeze_filesystems() */
49 #define MS_ACTIVE (1<<30)
50 #define MS_NOUSER (1<<31)
52 +#define MS_FROZEN (1<<29) /* Frozen by freeze_filesystems() */
54 * Superblock flags that can be altered by MS_REMOUNT