Skip to contentSkip to conversation

2.6.12-rc2-mm2

DISCUSSION Pavel Machek 1 participant 2 messages Apr 10, 2005 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

Hi! The patch is ok, but this should be rewriten to use cpu hotplug instead. I have some patches but they need more testing. --p

-- pavel. Sent from mobile phone. Sorry for poor formatting.

A message that is not in the archive (sent off-list or not yet received): [email protected]

#2 lore raw

smp swsusp [was Re: 2.6.12-rc2-mm2]

Hi!

Quoted 7 lines
Quoted 3 lines

Hi! The patch is ok, but this should be rewriten to use cpu hotplug instead. I have some patches but they need more testing. --p

Heh yeah on the whole it didn't work too well ;), tell me if you need smp testing. I only have S{0,1,4,5} here though (shouldn't there be a S2 at least also?), dual x64.

S2 basically does not exist. S3 is way more usable...

Here's patch, its against -mm; you'll probably need to adjust it a bit. Maybe pci.c changes are no longer relevant.

Pavel

drivers/pci/pci.c +2 -0
@@ -376,11 +376,13 @@
 	if (!pci_find_capability(dev, PCI_CAP_ID_PM))
 		return PCI_D0;
 
+#if 0
 	if (platform_pci_choose_state) {
 		ret = platform_pci_choose_state(dev, state);
 		if (ret >= 0)
 			state = ret;
 	}
+#endif
 	switch (state) {
 	case 0: return PCI_D0;
 	case 3: return PCI_D3hot;
kernel/power/Kconfig +1 -1
@@ -28,7 +28,7 @@
 
 config SOFTWARE_SUSPEND
 	bool "Software Suspend (EXPERIMENTAL)"
-	depends on EXPERIMENTAL && PM && SWAP
+	depends on EXPERIMENTAL && PM && SWAP && (HOTPLUG_CPU || !SMP)
 	---help---
 	  Enable the possibility of suspending the machine.
 	  It doesn't need APM.
kernel/power/smp.c +32 -58

111 lines not on this page · raw message

kernel/power/swsusp.c +3 -0
@@ -1194,8 +1194,11 @@
 		return "version";
 	if (strcmp(swsusp_info.uts.machine,system_utsname.machine))
 		return "machine";
+#if 0
+	/* We can't use number of CPUs when we use hotplug to remove them ;-))) */
 	if(swsusp_info.cpus != num_online_cpus())
 		return "number of cpus";
+#endif
 	return NULL;
 }
 
Signature · 1 line
Boycott Kodak -- for their patent abuse against Java.