Commit 5ae947ec authored by David Shaohua Li's avatar David Shaohua Li Committed by Len Brown

[ACPI] Suspend to RAM fix

Free some RAM before entering S3 so that upon
resume we can be sure early allocations will succeed.

http://bugzilla.kernel.org/show_bug.cgi?id=3469Signed-off-by: default avatarDavid Shaohua Li <shaohua.li@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent e2a5b420
...@@ -19,6 +19,9 @@ ...@@ -19,6 +19,9 @@
#include "power.h" #include "power.h"
/*This is just an arbitrary number */
#define FREE_PAGE_NUMBER (100)
DECLARE_MUTEX(pm_sem); DECLARE_MUTEX(pm_sem);
struct pm_ops * pm_ops = NULL; struct pm_ops * pm_ops = NULL;
...@@ -49,6 +52,7 @@ void pm_set_ops(struct pm_ops * ops) ...@@ -49,6 +52,7 @@ void pm_set_ops(struct pm_ops * ops)
static int suspend_prepare(suspend_state_t state) static int suspend_prepare(suspend_state_t state)
{ {
int error = 0; int error = 0;
unsigned int free_pages;
if (!pm_ops || !pm_ops->enter) if (!pm_ops || !pm_ops->enter)
return -EPERM; return -EPERM;
...@@ -60,6 +64,16 @@ static int suspend_prepare(suspend_state_t state) ...@@ -60,6 +64,16 @@ static int suspend_prepare(suspend_state_t state)
goto Thaw; goto Thaw;
} }
if ((free_pages = nr_free_pages()) < FREE_PAGE_NUMBER) {
pr_debug("PM: free some memory\n");
shrink_all_memory(FREE_PAGE_NUMBER - free_pages);
if (nr_free_pages() < FREE_PAGE_NUMBER) {
error = -ENOMEM;
printk(KERN_ERR "PM: No enough memory\n");
goto Thaw;
}
}
if (pm_ops->prepare) { if (pm_ops->prepare) {
if ((error = pm_ops->prepare(state))) if ((error = pm_ops->prepare(state)))
goto Thaw; goto Thaw;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment