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