~ubuntu-branches/ubuntu/precise/linux-lowlatency/precise-proposed

« back to all changes in this revision

Viewing changes to kernel/power/hibernate.c

  • Committer: Package Import Robot
  • Author(s): Luke Yelavich, Luke Yelavich, Upstream Kernel Changes
  • Date: 2012-04-04 18:49:36 UTC
  • Revision ID: package-import@ubuntu.com-20120404184936-tqu735914muv4wpg
Tags: 3.2.0-22.30
[ Luke Yelavich ]

* [Config] Update configs after rebase against Ubuntu-3.2.0-22.35

[ Upstream Kernel Changes ]

* Low-latency: Rebase against Ubuntu-3.2.0-22.35

Show diffs side-by-side

added added

removed removed

Lines of Context:
648
648
        /* Allocate memory management structures */
649
649
        error = create_basic_memory_bitmaps();
650
650
        if (error)
651
 
                goto Exit;
 
651
                goto Enable_umh;
652
652
 
653
653
        printk(KERN_INFO "PM: Syncing filesystems ... ");
654
654
        sys_sync();
656
656
 
657
657
        error = prepare_processes();
658
658
        if (error)
659
 
                goto Finish;
 
659
                goto Free_bitmaps;
660
660
 
661
661
        error = hibernation_snapshot(hibernation_mode == HIBERNATION_PLATFORM);
662
662
        if (error)
689
689
 
690
690
 Thaw:
691
691
        thaw_processes();
692
 
 Finish:
 
692
 Free_bitmaps:
693
693
        free_basic_memory_bitmaps();
 
694
 Enable_umh:
694
695
        usermodehelper_enable();
695
696
 Exit:
696
697
        pm_notifier_call_chain(PM_POST_HIBERNATION);