diff options
| author | Patrick Mochel <mochel@digitalimplant.org> | 2004-07-16 23:21:29 -0700 |
|---|---|---|
| committer | Patrick Mochel <mochel@digitalimplant.org> | 2004-07-16 23:21:29 -0700 |
| commit | c2cd403ce1dbf10ae43f912bbe068373a5b9c8bf (patch) | |
| tree | c4e173e7a8c9a390914ae0ed010c1a73e5d50829 /kernel/power/disk.c | |
| parent | a5b568fe6489270c25dba0abf13e740e6c72dab1 (diff) | |
[Power Mgmt] Merge pmdisk and swsusp write wrappers.
- Merge suspend_save_image() from both into one.
- Rename to swsusp_write().
- Remove pmdisk_write().
- Fixup call in kernel/power/disk.c and software_suspend().
- Mark lock_swapdevices() static again.
Diffstat (limited to 'kernel/power/disk.c')
| -rw-r--r-- | kernel/power/disk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/disk.c b/kernel/power/disk.c index 6c3a7defcaa5..4ed48e0e895b 100644 --- a/kernel/power/disk.c +++ b/kernel/power/disk.c @@ -24,7 +24,7 @@ extern u32 pm_disk_mode; extern struct pm_ops * pm_ops; extern int swsusp_suspend(void); -extern int pmdisk_write(void); +extern int swsusp_write(void); extern int swsusp_read(void); extern int swsusp_resume(void); extern int pmdisk_free(void); @@ -173,7 +173,7 @@ int pm_suspend_disk(void) mb(); barrier(); - error = pmdisk_write(); + error = swsusp_write(); if (!error) { error = power_down(pm_disk_mode); pr_debug("PM: Power down failed.\n"); |