From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 15 Sep 2010 06:48:27 +0000 (+0100)
Subject: x86: restore handling of "reboot=no"
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~11484
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d193f667ea025803917d5bfe17b492612d1a1ee9;p=xen.git

x86: restore handling of "reboot=no"

Somewhere between 3.2 and 3.3 this got dropped (as I noticed on a
[rarely used] box that didn't crash on me since then).

Signed-off-by: Jan Beulich <jbeulich@novell.com>
---

diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c
index dcaa79346b..7fa264125f 100644
--- a/xen/arch/x86/shutdown.c
+++ b/xen/arch/x86/shutdown.c
@@ -36,7 +36,7 @@ static long no_idt[2];
 static int reboot_mode;
 
 /*
- * reboot=b[ios] | t[riple] | k[bd] | [, [w]arm | [c]old]
+ * reboot=b[ios] | t[riple] | k[bd] | n[o] [, [w]arm | [c]old]
  * warm   Don't set the cold reboot flag
  * cold   Set the cold reboot flag
  * bios   Reboot by jumping through the BIOS (only for X86_32)
@@ -51,6 +51,9 @@ static void __init set_reboot_type(char *str)
     {
         switch ( *str )
         {
+        case 'n': /* no reboot */
+            opt_noreboot = 1;
+            break;
         case 'w': /* "warm" reboot (no memory testing etc) */
             reboot_mode = 0x1234;
             break;