GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-12 09:38:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[PATCH] swsusp: limit image size

Browse source 
Limit the size of the suspend image to approx.  500 MB, which should
improve the overall performance of swsusp on systems with more than 1 GB of
RAM.

It introduces the constant IMAGE_SIZE that can be set to the preferred size
of the image (in MB) and modifies the memory-shrinking part of swsusp to
take this constant into account (500 is the default value of IMAGE_SIZE).

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Rafael J. Wysocki 2006-01-06 00:15:22 -08:00 • committed by Linus Torvalds
parent c050ca7870
commit b3a93a255e
2 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
kernel/power/power.h
View file

@ -53,12 +53,10 @@ extern unsigned int nr_copy_pages;
extern struct pbe *pagedir_nosave; extern struct pbe *pagedir_nosave;
/* /*
* This compilation switch determines the way in which memory will be freed * Preferred image size in MB (set it to zero to get the smallest
* during suspend. If defined, only as much memory will be freed as needed * image possible)
* to complete the suspend, which will make it go faster. Otherwise, the
* largest possible amount of memory will be freed.
*/ */
#define FAST_FREE 1 #define IMAGE_SIZE 500
extern asmlinkage int swsusp_arch_suspend(void); extern asmlinkage int swsusp_arch_suspend(void);
extern asmlinkage int swsusp_arch_resume(void); extern asmlinkage int swsusp_arch_resume(void);

17
kernel/power/swsusp.c
View file

@ -626,7 +626,7 @@ int swsusp_write(struct pbe *pblist, unsigned int nr_pages)
int swsusp_shrink_memory(void) int swsusp_shrink_memory(void)
{ {
long tmp; long size, tmp;
struct zone *zone; struct zone *zone;
unsigned long pages = 0; unsigned long pages = 0;
unsigned int i = 0; unsigned int i = 0;
@ -634,11 +634,11 @@ int swsusp_shrink_memory(void)
printk("Shrinking memory... "); printk("Shrinking memory... ");
do { do {
#ifdef FAST_FREE size = 2 * count_highmem_pages();
tmp = 2 * count_highmem_pages(); size += size / 50 + count_data_pages();
tmp += tmp / 50 + count_data_pages(); size += (size + PBES_PER_PAGE - 1) / PBES_PER_PAGE +
tmp += (tmp + PBES_PER_PAGE - 1) / PBES_PER_PAGE +
PAGES_FOR_IO; PAGES_FOR_IO;
tmp = size;
for_each_zone (zone) for_each_zone (zone)
if (!is_highmem(zone)) if (!is_highmem(zone))
tmp -= zone->free_pages; tmp -= zone->free_pages;
@ -647,11 +647,10 @@ int swsusp_shrink_memory(void)
if (!tmp) if (!tmp)
return -ENOMEM; return -ENOMEM;
pages += tmp; pages += tmp;
} else if (size > (IMAGE_SIZE * 1024 * 1024) / PAGE_SIZE) {
tmp = shrink_all_memory(SHRINK_BITE);
pages += tmp;
} }
#else
tmp = shrink_all_memory(SHRINK_BITE);
pages += tmp;
#endif
printk("\b%c", p[i++%4]); printk("\b%c", p[i++%4]);
} while (tmp > 0); } while (tmp > 0);
printk("\bdone (%lu pages freed)\n", pages); printk("\bdone (%lu pages freed)\n", pages);