projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/mtd-2.6
[powerpc.git]
/
kernel
/
power
/
swsusp.c
diff --git
a/kernel/power/swsusp.c
b/kernel/power/swsusp.c
index
aa31432
..
7fb8343
100644
(file)
--- a/
kernel/power/swsusp.c
+++ b/
kernel/power/swsusp.c
@@
-230,9
+230,10
@@
int swsusp_shrink_memory(void)
for_each_zone (zone)
if (populated_zone(zone)) {
if (is_highmem(zone)) {
for_each_zone (zone)
if (populated_zone(zone)) {
if (is_highmem(zone)) {
- highmem_size -= zone->free_pages;
+ highmem_size -=
+ zone_page_state(zone, NR_FREE_PAGES);
} else {
} else {
- tmp -= zone
->free_pages
;
+ tmp -= zone
_page_state(zone, NR_FREE_PAGES)
;
tmp += zone->lowmem_reserve[ZONE_NORMAL];
tmp += snapshot_additional_pages(zone);
}
tmp += zone->lowmem_reserve[ZONE_NORMAL];
tmp += snapshot_additional_pages(zone);
}
@@
-288,7
+289,7
@@
int swsusp_suspend(void)
* that suspended with irqs off ... no overall powerup.
*/
device_power_up();
* that suspended with irqs off ... no overall powerup.
*/
device_power_up();
-Enable_irqs:
+
Enable_irqs:
local_irq_enable();
return error;
}
local_irq_enable();
return error;
}