Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PM / Hibernate: Make some boot messages look less scary

Browse source 
The hibernate resume code checks if there is an image to resume from
on every boot and, if the kernel is built with CONFIG_PM_DEBUG set
and the image is not present, it prints some scary messages
suggesting there was a boot error of some sort.  Apparently, some
users are confused by them, so make them look less scary and adjust
the other hibernate resume debug messages to match them.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
This commit is contained in:
Rafael J. Wysocki 2010-09-28 23:31:22 +02:00
parent 15bcb91d7e
commit d0941ead3f
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
kernel/power/hibernate.c
View file

@ -708,7 +708,7 @@ static int software_resume(void)
goto Unlock; goto Unlock;
} }
pr_debug("PM: Checking image partition %s\n", resume_file); pr_debug("PM: Checking hibernation image partition %s\n", resume_file);
/* Check if the device is there */ /* Check if the device is there */
swsusp_resume_device = name_to_dev_t(resume_file); swsusp_resume_device = name_to_dev_t(resume_file);
@ -733,10 +733,10 @@ static int software_resume(void)
} }
Check_image: Check_image:
pr_debug("PM: Resume from partition %d:%d\n", pr_debug("PM: Hibernation image partition %d:%d present\n",
MAJOR(swsusp_resume_device), MINOR(swsusp_resume_device)); MAJOR(swsusp_resume_device), MINOR(swsusp_resume_device));
pr_debug("PM: Checking hibernation image.\n"); pr_debug("PM: Looking for hibernation image.\n");
error = swsusp_check(); error = swsusp_check();
if (error) if (error)
goto Unlock; goto Unlock;
@ -768,14 +768,14 @@ static int software_resume(void)
goto Done; goto Done;
} }
pr_debug("PM: Reading hibernation image.\n"); pr_debug("PM: Loading hibernation image.\n");
error = swsusp_read(&flags); error = swsusp_read(&flags);
swsusp_close(FMODE_READ); swsusp_close(FMODE_READ);
if (!error) if (!error)
hibernation_restore(flags & SF_PLATFORM_MODE); hibernation_restore(flags & SF_PLATFORM_MODE);
printk(KERN_ERR "PM: Restore failed, recovering.\n"); printk(KERN_ERR "PM: Failed to load hibernation image, recovering.\n");
swsusp_free(); swsusp_free();
thaw_processes(); thaw_processes();
Done: Done:
@ -788,7 +788,7 @@ static int software_resume(void)
/* For success case, the suspend path will release the lock */ /* For success case, the suspend path will release the lock */
Unlock: Unlock:
mutex_unlock(&pm_mutex); mutex_unlock(&pm_mutex);
pr_debug("PM: Resume from disk failed.\n"); pr_debug("PM: Hibernation image not present or could not be loaded.\n");
return error; return error;
close_finish: close_finish:
swsusp_close(FMODE_READ); swsusp_close(FMODE_READ);

4
kernel/power/swap.c
View file

@ -929,13 +929,13 @@ int swsusp_check(void)
if (error) if (error)
blkdev_put(hib_resume_bdev, FMODE_READ); blkdev_put(hib_resume_bdev, FMODE_READ);
else else
pr_debug("PM: Signature found, resuming\n"); pr_debug("PM: Image signature found, resuming\n");
} else { } else {
error = PTR_ERR(hib_resume_bdev); error = PTR_ERR(hib_resume_bdev);
} }
if (error) if (error)
pr_debug("PM: Error %d checking image file\n", error); pr_debug("PM: Image not found (code %d)\n", error);
return error; return error;
} }