From 4cd821dfd8c1be920274f315e4823cb67df7df0a Mon Sep 17 00:00:00 2001 From: Pavel Machek Date: Tue, 25 Jan 2005 04:40:02 -0800 Subject: [PATCH] Enable swsusp on SMP machines This enables swsusp on SMP machines. It should be working in 2.6.10, already (but you may need noapic in 2.6.10). Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- kernel/power/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'kernel') diff --git a/kernel/power/main.c b/kernel/power/main.c index b7ef95c96230..0f78207cfb57 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c @@ -141,14 +141,14 @@ static int enter_state(suspend_state_t state) if (down_trylock(&pm_sem)) return -EBUSY; - /* Suspend is hard to get right on SMP. */ - if (num_online_cpus() != 1) { - error = -EPERM; + if (state == PM_SUSPEND_DISK) { + error = pm_suspend_disk(); goto Unlock; } - if (state == PM_SUSPEND_DISK) { - error = pm_suspend_disk(); + /* Suspend is hard to get right on SMP. */ + if (num_online_cpus() != 1) { + error = -EPERM; goto Unlock; } -- cgit v1.2.3