Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1581025

[PATCH] powerpc/xmon: Fix an unexpected xmon onoff state change

Show all headers | View raw

Once xmon is triggered by sysrq-x, it is enabled always afterwards even
if it is disabled during boot. This will cause a system reset interrut
fail to dump. So keep xmon in its original state after exit.

Signed-off-by: Pan Xinhui <xinhui.pan@linux.vnet.ibm.com>
---
 arch/powerpc/xmon/xmon.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 9c0e17c..721212f 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -76,6 +76,7 @@ static int xmon_gate;
 #endif /* CONFIG_SMP */
 
 static unsigned long in_xmon __read_mostly = 0;
+static int xmon_off = 0;
 
 static unsigned long adrs;
 static int size = 1;
@@ -3250,6 +3251,8 @@ static void sysrq_handle_xmon(int key)
 	/* ensure xmon is enabled */
 	xmon_init(1);
 	debugger(get_irq_regs());
+	if (xmon_off)
+		xmon_init(0);
 }
 
 static struct sysrq_key_op sysrq_xmon_op = {
@@ -3266,7 +3269,7 @@ static int __init setup_xmon_sysrq(void)
 __initcall(setup_xmon_sysrq);
 #endif /* CONFIG_MAGIC_SYSRQ */
 
-static int __initdata xmon_early, xmon_off;
+static int __initdata xmon_early;
 
 static int __init early_parse_xmon(char *p)
 {
-- 
2.4.11

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] powerpc/xmon: Fix an unexpected xmon onoff state change Pan Xinhui <xinhui.pan@linux.vnet.ibm.com> - 2017-02-15 04:00 +0100
  Re: [PATCH] powerpc/xmon: Fix an unexpected xmon onoff state change "Guilherme G. Piccoli" <gpiccoli@linux.vnet.ibm.com> - 2017-02-15 22:30 +0100
  Re: [PATCH] powerpc/xmon: Fix an unexpected xmon onoff state change Michael Ellerman <mpe@ellerman.id.au> - 2017-02-16 06:10 +0100
    Re: [PATCH] powerpc/xmon: Fix an unexpected xmon onoff state change "Guilherme G. Piccoli" <gpiccoli@linux.vnet.ibm.com> - 2017-02-16 12:00 +0100
      Re: [PATCH] powerpc/xmon: Fix an unexpected xmon onoff state change Pan Xinhui <xinhui@linux.vnet.ibm.com> - 2017-02-16 13:00 +0100
        Re: [PATCH] powerpc/xmon: Fix an unexpected xmon onoff state change Michael Ellerman <mpe@ellerman.id.au> - 2017-02-17 07:10 +0100
          Re: [PATCH] powerpc/xmon: Fix an unexpected xmon onoff state change Pan Xinhui <xinhui@linux.vnet.ibm.com> - 2017-02-17 10:40 +0100
            Re: [PATCH] powerpc/xmon: Fix an unexpected xmon onoff state change "Guilherme G. Piccoli" <gpiccoli@linux.vnet.ibm.com> - 2017-02-17 13:30 +0100
            Re: [PATCH] powerpc/xmon: Fix an unexpected xmon onoff state change Michael Ellerman <mpe@ellerman.id.au> - 2017-02-20 05:50 +0100

csiph-web