/[pkg-src]/trunk/kernel26-magellan/patches-2.6.16-r3/0027-2.6.16-swsusp-post_resume_aggressive_swap_prefetch.patch |
Contents of /trunk/kernel26-magellan/patches-2.6.16-r3/0027-2.6.16-swsusp-post_resume_aggressive_swap_prefetch.patch
Parent Directory | Revision Log
Revision 70 -
(show annotations)
(download)
Thu May 11 19:09:22 2006 UTC (18 years ago) by niro
File size: 1793 byte(s)
Thu May 11 19:09:22 2006 UTC (18 years ago) by niro
File size: 1793 byte(s)
import
1 | --- |
2 | include/linux/suspend.h | 1 + |
3 | kernel/power/disk.c | 2 +- |
4 | kernel/power/swsusp.c | 3 +++ |
5 | 3 files changed, 5 insertions(+), 1 deletion(-) |
6 | |
7 | Index: linux-2.6.16-ck1/kernel/power/swsusp.c |
8 | =================================================================== |
9 | --- linux-2.6.16-ck1.orig/kernel/power/swsusp.c 2006-03-20 20:46:23.000000000 +1100 |
10 | +++ linux-2.6.16-ck1/kernel/power/swsusp.c 2006-03-20 20:47:03.000000000 +1100 |
11 | @@ -60,6 +60,7 @@ |
12 | #include <linux/syscalls.h> |
13 | #include <linux/highmem.h> |
14 | #include <linux/bio.h> |
15 | +#include <linux/swap-prefetch.h> |
16 | |
17 | #include <asm/uaccess.h> |
18 | #include <asm/mmu_context.h> |
19 | @@ -632,6 +633,8 @@ Restore_highmem: |
20 | device_power_up(); |
21 | Enable_irqs: |
22 | local_irq_enable(); |
23 | + if (!in_suspend) |
24 | + aggressive_swap_prefetch(); |
25 | return error; |
26 | } |
27 | |
28 | Index: linux-2.6.16-ck1/include/linux/suspend.h |
29 | =================================================================== |
30 | --- linux-2.6.16-ck1.orig/include/linux/suspend.h 2006-03-20 20:46:23.000000000 +1100 |
31 | +++ linux-2.6.16-ck1/include/linux/suspend.h 2006-03-20 20:47:03.000000000 +1100 |
32 | @@ -42,6 +42,7 @@ extern void mark_free_pages(struct zone |
33 | #ifdef CONFIG_PM |
34 | /* kernel/power/swsusp.c */ |
35 | extern int software_suspend(void); |
36 | +extern int in_suspend; |
37 | |
38 | #if defined(CONFIG_VT) && defined(CONFIG_VT_CONSOLE) |
39 | extern int pm_prepare_console(void); |
40 | Index: linux-2.6.16-ck1/kernel/power/disk.c |
41 | =================================================================== |
42 | --- linux-2.6.16-ck1.orig/kernel/power/disk.c 2006-03-20 20:46:23.000000000 +1100 |
43 | +++ linux-2.6.16-ck1/kernel/power/disk.c 2006-03-20 20:47:03.000000000 +1100 |
44 | @@ -71,7 +71,7 @@ static void power_down(suspend_disk_meth |
45 | } |
46 | |
47 | |
48 | -static int in_suspend __nosavedata = 0; |
49 | +int in_suspend __nosavedata = 0; |
50 | |
51 | |
52 | static inline void platform_finish(void) |