lkml.org 
[lkml]   [2009]   [May]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC][PATCH 2/6] PM/Suspend: Do not shrink memory before suspend
    Date
    From: Rafael J. Wysocki <rjw@sisk.pl>

    Remove the shrinking of memory from the suspend-to-RAM code, where
    it is not really necessary.

    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Acked-by: Nigel Cunningham <nigel@tuxonice.net>
    Acked-by: Wu Fengguang <fengguang.wu@intel.com>
    ---
    kernel/power/main.c | 20 +-------------------
    mm/vmscan.c | 4 ++--
    2 files changed, 3 insertions(+), 21 deletions(-)

    Index: linux-2.6/kernel/power/main.c
    ===================================================================
    --- linux-2.6.orig/kernel/power/main.c
    +++ linux-2.6/kernel/power/main.c
    @@ -188,9 +188,6 @@ static void suspend_test_finish(const ch

    #endif

    -/* This is just an arbitrary number */
    -#define FREE_PAGE_NUMBER (100)
    -
    static struct platform_suspend_ops *suspend_ops;

    /**
    @@ -226,7 +223,6 @@ int suspend_valid_only_mem(suspend_state
    static int suspend_prepare(void)
    {
    int error;
    - unsigned int free_pages;

    if (!suspend_ops || !suspend_ops->enter)
    return -EPERM;
    @@ -241,24 +237,10 @@ static int suspend_prepare(void)
    if (error)
    goto Finish;

    - if (suspend_freeze_processes()) {
    - error = -EAGAIN;
    - goto Thaw;
    - }
    -
    - free_pages = global_page_state(NR_FREE_PAGES);
    - if (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");
    - }
    - }
    + error = suspend_freeze_processes();
    if (!error)
    return 0;

    - Thaw:
    suspend_thaw_processes();
    usermodehelper_enable();
    Finish:
    Index: linux-2.6/mm/vmscan.c
    ===================================================================
    --- linux-2.6.orig/mm/vmscan.c
    +++ linux-2.6/mm/vmscan.c
    @@ -2054,7 +2054,7 @@ unsigned long global_lru_pages(void)
    + global_page_state(NR_INACTIVE_FILE);
    }

    -#ifdef CONFIG_PM
    +#ifdef CONFIG_HIBERNATION
    /*
    * Helper function for shrink_all_memory(). Tries to reclaim 'nr_pages' pages
    * from LRU lists system-wide, for given pass and priority.
    @@ -2194,7 +2194,7 @@ out:

    return sc.nr_reclaimed;
    }
    -#endif
    +#endif /* CONFIG_HIBERNATION */

    /* It's optimal to keep kswapds on the same CPUs as their memory, but
    not required for correctness. So if the last cpu in a node goes

    \
     
     \ /
      Last update: 2009-05-10 16:17    [W:0.022 / U:30.028 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site