]>
Commit | Line | Data |
---|---|---|
a277f547 AM |
1 | --- linux.org/kernel/power/suspend.c.org 2004-09-26 01:20:35.304106773 +0200 |
2 | +++ linux/kernel/power/suspend.c 2004-09-26 01:23:29.340823488 +0200 | |
a277f547 AM |
3 | @@ -66,6 +67,8 @@ |
4 | #include <asm/i387.h> /* for kernel_fpu_end */ | |
5 | #endif | |
6 | ||
7 | +#include <asm/uaccess.h> | |
8 | + | |
9 | static unsigned long avenrun_save[3]; | |
10 | static u32 pm_disk_mode_save; | |
11 | struct partial_device_tree * suspend_device_tree; | |
12 | --- linux.org/kernel/power/suspend_gzip.c.org 2004-09-26 01:26:01.468233758 +0200 | |
13 | +++ linux/kernel/power/suspend_gzip.c 2004-09-26 01:27:01.486376279 +0200 | |
14 | @@ -417,7 +417,7 @@ | |
15 | ||
16 | static unsigned long gzip_memory_needed(void) | |
17 | { | |
18 | - return PAGE_SIZE + MAX( zlib_deflate_workspacesize(), | |
19 | + return PAGE_SIZE + max( zlib_deflate_workspacesize(), | |
20 | zlib_inflate_workspacesize()); | |
21 | } | |
22 | ||
23 | --- linux.org/arch/i386/kernel/apm.c.org 2004-09-26 01:28:46.748826268 +0200 | |
24 | +++ linux/arch/i386/kernel/apm.c 2004-09-26 01:32:46.482468957 +0200 | |
25 | @@ -230,6 +230,7 @@ | |
26 | #include <asm/desc.h> | |
27 | ||
28 | #include "io_ports.h" | |
29 | +#include "../../../kernel/power/suspend.h" | |
30 | ||
31 | extern spinlock_t i8253_lock; | |
32 | extern unsigned long get_cmos_time(void); | |
33 | --- linux.org/kernel/power/suspend_builtin.c.org 2004-09-26 02:08:00.658556314 +0200 | |
34 | +++ linux/kernel/power/suspend_builtin.c 2004-09-26 02:08:31.620923353 +0200 | |
35 | @@ -13,6 +13,8 @@ | |
36 | #include <linux/module.h> | |
37 | #include <linux/reboot.h> | |
38 | ||
39 | +#include <asm/uaccess.h> | |
40 | + | |
41 | #include "suspend.h" | |
42 | /* | |
43 | *--------------------- Variables --------------------------- | |
975f9ce6 | 44 |