joel16/android_kernel_sony_msm8994_rework
1
0
Fork 0
mirror of https://github.com/joel16/android_kernel_sony_msm8994_rework.git synced 2024-12-21 03:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PATCH] swsusp: use bytes as image size units

Browse Source 
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:
Rafael J. Wysocki 2006-02-01 03:05:07 -08:00 committed by Linus Torvalds
parent e8730eabd4
commit 853609b61e
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/power/interface.txt
View File

@ -44,7 +44,7 @@ it.
/sys/power/image_size controls the size of the image created by /sys/power/image_size controls the size of the image created by
the suspend-to-disk mechanism. It can be written a string the suspend-to-disk mechanism. It can be written a string
representing a non-negative integer that will be used as an upper 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, 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 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 smallest image possible. In particular, if "0" is written to this file, the

2
Documentation/power/swsusp.txt
View File

@ -27,7 +27,7 @@ echo shutdown > /sys/power/disk; echo disk > /sys/power/state
echo platform > /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 echo N > /sys/power/image_size

6
kernel/power/disk.c
View File

@ -367,14 +367,14 @@ power_attr(resume);
static ssize_t image_size_show(struct subsystem * subsys, char *buf) 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) 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; image_size = size;
return n; return n;
} }

4
kernel/power/power.h
View File

@ -51,8 +51,8 @@ extern const void __nosave_begin, __nosave_end;
extern unsigned int nr_copy_pages; extern unsigned int nr_copy_pages;
extern struct pbe *pagedir_nosave; extern struct pbe *pagedir_nosave;
/* Preferred image size in MB (default 500) */ /* Preferred image size in bytes (default 500 MB) */
extern unsigned int image_size; extern unsigned long image_size;
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);

8
kernel/power/swsusp.c
View File

@ -70,12 +70,12 @@
#include "power.h" #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 * 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. * try to create the smallest image possible.
*/ */
unsigned int image_size = 500; unsigned long image_size = 500 * 1024 * 1024;
#ifdef CONFIG_HIGHMEM #ifdef CONFIG_HIGHMEM
unsigned int count_highmem_pages(void); unsigned int count_highmem_pages(void);
@ -590,7 +590,7 @@ 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) { } else if (size > image_size / PAGE_SIZE) {
tmp = shrink_all_memory(SHRINK_BITE); tmp = shrink_all_memory(SHRINK_BITE);
pages += tmp; pages += tmp;
} }