[PATCH] swsusp: use bytes as image size units
Make swsusp use bytes as the image size units, which is needed for future compatibility. 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:
Родитель
e8730eabd4
Коммит
853609b61e
|
@ -44,7 +44,7 @@ it.
|
|||
/sys/power/image_size controls the size of the image created by
|
||||
the suspend-to-disk mechanism. It can be written a string
|
||||
representing a non-negative integer that will be used as an upper
|
||||
limit of the image size, in megabytes. The suspend-to-disk mechanism will
|
||||
limit of the image size, in bytes. The suspend-to-disk mechanism will
|
||||
do its best to ensure the image size will not exceed that number. However,
|
||||
if this turns out to be impossible, it will try to suspend anyway using the
|
||||
smallest image possible. In particular, if "0" is written to this file, the
|
||||
|
|
|
@ -27,7 +27,7 @@ echo shutdown > /sys/power/disk; echo disk > /sys/power/state
|
|||
|
||||
echo platform > /sys/power/disk; echo disk > /sys/power/state
|
||||
|
||||
If you want to limit the suspend image size to N megabytes, do
|
||||
If you want to limit the suspend image size to N bytes, do
|
||||
|
||||
echo N > /sys/power/image_size
|
||||
|
||||
|
|
|
@ -367,14 +367,14 @@ power_attr(resume);
|
|||
|
||||
static ssize_t image_size_show(struct subsystem * subsys, char *buf)
|
||||
{
|
||||
return sprintf(buf, "%u\n", image_size);
|
||||
return sprintf(buf, "%lu\n", image_size);
|
||||
}
|
||||
|
||||
static ssize_t image_size_store(struct subsystem * subsys, const char * buf, size_t n)
|
||||
{
|
||||
unsigned int size;
|
||||
unsigned long size;
|
||||
|
||||
if (sscanf(buf, "%u", &size) == 1) {
|
||||
if (sscanf(buf, "%lu", &size) == 1) {
|
||||
image_size = size;
|
||||
return n;
|
||||
}
|
||||
|
|
|
@ -51,8 +51,8 @@ extern const void __nosave_begin, __nosave_end;
|
|||
extern unsigned int nr_copy_pages;
|
||||
extern struct pbe *pagedir_nosave;
|
||||
|
||||
/* Preferred image size in MB (default 500) */
|
||||
extern unsigned int image_size;
|
||||
/* Preferred image size in bytes (default 500 MB) */
|
||||
extern unsigned long image_size;
|
||||
|
||||
extern asmlinkage int swsusp_arch_suspend(void);
|
||||
extern asmlinkage int swsusp_arch_resume(void);
|
||||
|
|
|
@ -70,12 +70,12 @@
|
|||
#include "power.h"
|
||||
|
||||
/*
|
||||
* Preferred image size in MB (tunable via /sys/power/image_size).
|
||||
* Preferred image size in bytes (tunable via /sys/power/image_size).
|
||||
* When it is set to N, swsusp will do its best to ensure the image
|
||||
* size will not exceed N MB, but if that is impossible, it will
|
||||
* size will not exceed N bytes, but if that is impossible, it will
|
||||
* try to create the smallest image possible.
|
||||
*/
|
||||
unsigned int image_size = 500;
|
||||
unsigned long image_size = 500 * 1024 * 1024;
|
||||
|
||||
#ifdef CONFIG_HIGHMEM
|
||||
unsigned int count_highmem_pages(void);
|
||||
|
@ -590,7 +590,7 @@ int swsusp_shrink_memory(void)
|
|||
if (!tmp)
|
||||
return -ENOMEM;
|
||||
pages += tmp;
|
||||
} else if (size > (image_size * 1024 * 1024) / PAGE_SIZE) {
|
||||
} else if (size > image_size / PAGE_SIZE) {
|
||||
tmp = shrink_all_memory(SHRINK_BITE);
|
||||
pages += tmp;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче