projects / packages / kernel.git / blame
| Commit | Line | Data |
|---|---|---|
| e4a6a92b | 1 | --- a/init/main.c 2007-10-02 14:01:04.772023000 +0200 |
| 2 | +++ b/init/main.c 2007-10-02 14:07:34.520380750 +0200 | |
| 0b5d24f9 | 3 | @@ -51,12 +51,12 @@ |
| e4a6a92b | 4 | #include <linux/key.h> |
| 5 | #include <linux/unwind.h> | |
| 6 | #include <linux/buffer_head.h> | |
| 0eaa1d5b | 7 | +#include <linux/dyn_pageflags.h> |
| e4a6a92b | 8 | #include <linux/debug_locks.h> |
| 9 | #include <linux/lockdep.h> | |
| 10 | #include <linux/pid_namespace.h> | |
| 11 | #include <linux/device.h> | |
| 12 | #include <linux/kthread.h> | |
| 0eaa1d5b | 13 | -#include <linux/dyn_pageflags.h> |
| 0b5d24f9 | 14 | #include <linux/sched.h> |
| e4a6a92b | 15 | |
| 16 | #include <asm/io.h> | |
| e4a6a92b | 17 | --- a/kernel/printk.c 2007-10-02 14:01:04.780023500 +0200 |
| 18 | +++ b/kernel/printk.c 2007-10-02 14:09:40.140231500 +0200 | |
| 9e282013 | 19 | @@ -28,9 +28,9 @@ |
| e4a6a92b | 20 | #include <linux/delay.h> |
| 21 | #include <linux/smp.h> | |
| 22 | #include <linux/security.h> | |
| 23 | +#include <linux/suspend.h> | |
| 24 | #include <linux/bootmem.h> | |
| 25 | #include <linux/syscalls.h> | |
| e4a6a92b | 26 | -#include <linux/suspend.h> |
| 27 | ||
| 28 | #include <asm/uaccess.h> | |
| 29 | ||
| 47872f53 AM |
30 | --- a/kernel/timer.c.org 2008-01-20 11:46:53.931178999 +0100 |
| 31 | +++ b/kernel/timer.c 2008-01-20 11:47:09.758637482 +0100 | |
| 32 | @@ -32,13 +32,13 @@ | |
| 33 | #include <linux/time.h> | |
| 34 | #include <linux/jiffies.h> | |
| 35 | #include <linux/posix-timers.h> | |
| 36 | +#include <linux/notifier.h> | |
| 37 | +#include <linux/suspend.h> | |
| 38 | #include <linux/cpu.h> | |
| 39 | #include <linux/syscalls.h> | |
| 40 | #include <linux/delay.h> | |
| 41 | #include <linux/tick.h> | |
| 42 | #include <linux/kallsyms.h> | |
| 43 | -#include <linux/notifier.h> | |
| 44 | -#include <linux/suspend.h> | |
| 45 | ||
| 46 | #include <asm/uaccess.h> | |
| 47 | #include <asm/unistd.h> | |
| 48 | ||
| 9e282013 | 49 | --- e/include/linux/fs.h 2008-05-07 11:39:56.000000000 +0000 |
| 50 | +++ e/include/linux/fs.h 2008-05-07 11:43:49.907309587 +0000 | |
| 51 | @@ -127,10 +127,10 @@ | |
| 47872f53 AM |
52 | #define MS_RELATIME (1<<21) /* Update atime relative to mtime/ctime. */ |
| 53 | #define MS_KERNMOUNT (1<<22) /* this is a kern_mount call */ | |
| 9e282013 | 54 | #define MS_I_VERSION (1<<23) /* Update inode I_version field */ |
| 55 | -#define MS_FROZEN (1<<24) /* Frozen by freeze_filesystems() */ | |
| 47872f53 AM |
56 | #define MS_ACTIVE (1<<30) |
| 57 | #define MS_NOUSER (1<<31) | |
| 58 | ||
| 9e282013 | 59 | +#define MS_FROZEN (1<<29) /* Frozen by freeze_filesystems() */ |
| 60 | /* | |
| 61 | * Superblock flags that can be altered by MS_REMOUNT | |
| 62 | */ |