lkml.org 
[lkml]   [2004]   [Jul]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[25/25] Merge pmdisk and swsusp

    ChangeSet 1.1867, 2004/07/17 14:50:11-07:00, mochel@digitalimplant.org

    [swsusp] Fix nasty typo.


    kernel/power/swsusp.c | 10 +++++-----
    1 files changed, 5 insertions(+), 5 deletions(-)


    diff -Nru a/kernel/power/swsusp.c b/kernel/power/swsusp.c
    --- a/kernel/power/swsusp.c 2004-07-17 14:50:21 -07:00
    +++ b/kernel/power/swsusp.c 2004-07-17 14:50:21 -07:00
    @@ -578,7 +578,7 @@
    return 0;
    }
    if ((chunk_size = is_head_of_free_region(page))) {
    - zone_pfn += chunk_size - 1;
    + *zone_pfn += chunk_size - 1;
    return 0;
    }

    @@ -601,11 +601,11 @@
    }


    -static void copy_data_pages(struct pbe * pbe)
    +static void copy_data_pages(void)
    {
    struct zone *zone;
    unsigned long zone_pfn;
    -
    + struct pbe * pbe = pagedir_nosave;

    for_each_zone(zone) {
    if (!is_highmem(zone))
    @@ -807,9 +807,9 @@
    printk(", ");
    #endif

    - printk("counting pages to copy" );
    drain_local_pages();
    count_data_pages();
    + printk("swsusp: Need to copy %u pages\n",nr_copy_pages);
    nr_needed_pages = nr_copy_pages + PAGES_FOR_IO;

    swsusp_alloc();
    @@ -818,7 +818,7 @@
    * Kill them.
    */
    drain_local_pages();
    - copy_data_pages(pagedir_nosave);
    + copy_data_pages();

    /*
    * End of critical section. From now on, we can write to memory,
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2005-03-22 14:04    [W:0.019 / U:7.192 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site