From 5e4c2df83b415626a7c2aa9663be3b78493e28a0 Mon Sep 17 00:00:00 2001
From: Andi Kleen <andi@firstfloor.org>
Date: Mon, 13 Apr 2009 14:40:08 -0700
Subject: [PATCH] --- yaml --- r: 143217 b: refs/heads/master c:
 3d26dcf7679c5cc6c9f3b95ffdb2152fba2b7fae h: refs/heads/master i:   143215:
 25ca25f124c7e037fdda1da71633903233ac2d69 v: v3

---
 [refs]             |  2 +-
 trunk/kernel/sys.c | 24 +++++++++---------------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 6e68afd12428..a583c4140f58 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4cafbd0b94d2c8cae6ede6d1c3ab90547547a3d2
+refs/heads/master: 3d26dcf7679c5cc6c9f3b95ffdb2152fba2b7fae
diff --git a/trunk/kernel/sys.c b/trunk/kernel/sys.c
index 51dbb55604e8..e7998cf31498 100644
--- a/trunk/kernel/sys.c
+++ b/trunk/kernel/sys.c
@@ -360,6 +360,7 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,
 		void __user *, arg)
 {
 	char buffer[256];
+	int ret = 0;
 
 	/* We only trust the superuser with rebooting the system. */
 	if (!capable(CAP_SYS_BOOT))
@@ -397,7 +398,7 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,
 		kernel_halt();
 		unlock_kernel();
 		do_exit(0);
-		break;
+		panic("cannot halt");
 
 	case LINUX_REBOOT_CMD_POWER_OFF:
 		kernel_power_off();
@@ -417,29 +418,22 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,
 
 #ifdef CONFIG_KEXEC
 	case LINUX_REBOOT_CMD_KEXEC:
-		{
-			int ret;
-			ret = kernel_kexec();
-			unlock_kernel();
-			return ret;
-		}
+		ret = kernel_kexec();
+		break;
 #endif
 
 #ifdef CONFIG_HIBERNATION
 	case LINUX_REBOOT_CMD_SW_SUSPEND:
-		{
-			int ret = hibernate();
-			unlock_kernel();
-			return ret;
-		}
+		ret = hibernate();
+		break;
 #endif
 
 	default:
-		unlock_kernel();
-		return -EINVAL;
+		ret = -EINVAL;
+		break;
 	}
 	unlock_kernel();
-	return 0;
+	return ret;
 }
 
 static void deferred_cad(struct work_struct *dummy)