[Power Mgmt] Make default partition config option part of swsusp.

- Remove from pmdisk.
- Remove pmdisk= command line option.

kernel/power/Kconfig

@@ -54,12 +54,12 @@ config PM_DISK
 
 	If unsure, Say N.
 
-config PM_DISK_PARTITION
+config PM_STD_PARTITION
 	string "Default resume partition"
-	depends on PM_DISK
+	depends on SOFTWARE_SUSPEND
 	default ""
 	---help---
-	  The default resume partition is the partition that the pmdisk suspend-
+	  The default resume partition is the partition that the suspend-
 	  to-disk implementation will look for a suspended disk image. 
 
 	  The partition specified here will be different for almost every user. 
@@ -68,16 +68,10 @@ config PM_DISK_PARTITION
 
 	  The partition specified can be overridden by specifying:
 
-		pmdisk=/dev/<other device> 
+		resume=/dev/<other device> 
 
 	  which will set the resume partition to the device specified. 
 
-	  One may also do: 
-
-		pmdisk=off
-
-	  to inform the kernel not to perform a resume transition. 
-
 	  Note there is currently not a way to specify which device to save the
 	  suspended image to. It will simply pick the first available swap 
 	  device.

kernel/power/pmdisk.c

@@ -33,26 +33,3 @@
 
 #include "power.h"
 
-/* For resume= kernel option */
-static char resume_file[256] = CONFIG_PM_DISK_PARTITION;
-extern suspend_pagedir_t *pagedir_save;
-
-/*
- * Saving part...
- */
-
-
-static int __init pmdisk_setup(char *str)
-{
-	if (strlen(str)) {
-		if (!strcmp(str,"off"))
-			resume_file[0] = '\0';
-		else
-			strncpy(resume_file, str, 255);
-	} else
-		resume_file[0] = '\0';
-	return 1;
-}
-
-__setup("pmdisk=", pmdisk_setup);
-

kernel/power/swsusp.c

@@ -89,7 +89,7 @@ int pagedir_order_check;
 int nr_copy_pages_check;
 
 static int resume_status;
-static char resume_file[256] = "";			/* For resume= kernel option */
+static char resume_file[256] = CONFIG_PM_STD_PARTITION;
 static dev_t resume_device;
 /* Local variables that should not be affected by save */
 unsigned int nr_copy_pages __nosavedata = 0;