X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel%2Fpower%2Fdisk.c;h=81d4d982f3f097f55f02f427381f8871cac6f8cf;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=7c7b9b65e365058935a5d5b77ac807b2d669df59;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index 7c7b9b65e..81d4d982f 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -18,7 +18,6 @@
 #include <linux/fs.h>
 #include <linux/mount.h>
 #include <linux/pm.h>
-#include <linux/cpu.h>
 
 #include "power.h"
 
@@ -73,10 +72,7 @@ static int prepare_processes(void)
 	int error;
 
 	pm_prepare_console();
-
-	error = disable_nonboot_cpus();
-	if (error)
-		goto enable_cpus;
+	disable_nonboot_cpus();
 
 	if (freeze_processes()) {
 		error = -EBUSY;
@@ -88,7 +84,6 @@ static int prepare_processes(void)
 		return 0;
 thaw:
 	thaw_processes();
-enable_cpus:
 	enable_nonboot_cpus();
 	pm_restore_console();
 	return error;
@@ -236,7 +231,7 @@ static int software_resume(void)
 late_initcall(software_resume);
 
 
-static const char * const pm_disk_modes[] = {
+static char * pm_disk_modes[] = {
 	[PM_DISK_FIRMWARE]	= "firmware",
 	[PM_DISK_PLATFORM]	= "platform",
 	[PM_DISK_SHUTDOWN]	= "shutdown",