Merge home:v2.5/linux into kiwi.transmeta.com:/home/torvalds/v2.5/linux

c9b0864a · Linus Torvalds · Linus Torvalds · 28fb8067 · 06f240e0 · c9b0864a
Commit c9b0864a authored Sep 19, 2002 by Linus Torvalds Committed by Linus Torvalds Sep 19, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

kernel/sys.c kernel/sys.c +3 -2

No files found.
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -412,9 +412,10 @@ asmlinkage long sys_reboot(int magic1, int magic2, unsigned int cmd, void * arg)

 #ifdef CONFIG_SOFTWARE_SUSPEND
 	case LINUX_REBOOT_CMD_SW_SUSPEND:
-		if(!software_suspend_enabled)
+		if (!software_suspend_enabled) {
+			unlock_kernel();
 			return -EAGAIN;
-		
+		}		
 		software_suspend();
 		do_exit(0);
 		break;