From: John Stultz Date: Fri, 4 Dec 2015 19:32:21 +0000 (-0800) Subject: fiq_debugger: Build fixes for 4.1 X-Git-Tag: firefly_0821_release~2958^2~320 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e4123d4ac6df42faa5b51c3410349578648e6003;p=firefly-linux-kernel-4.4.55.git fiq_debugger: Build fixes for 4.1 Small build updates for 4.1 Signed-off-by: John Stultz --- diff --git a/drivers/staging/android/fiq_debugger/fiq_debugger.c b/drivers/staging/android/fiq_debugger/fiq_debugger.c index 7d6b4ae8a2cd..7f056831dbff 100644 --- a/drivers/staging/android/fiq_debugger/fiq_debugger.c +++ b/drivers/staging/android/fiq_debugger/fiq_debugger.c @@ -517,7 +517,7 @@ static bool fiq_debugger_fiq_exec(struct fiq_debugger_state *state, fiq_debugger_printf(&state->output, "cpu %d\n", state->current_cpu); } else if (!strncmp(cmd, "cpu ", 4)) { unsigned long cpu = 0; - if (strict_strtoul(cmd + 4, 10, &cpu) == 0) + if (kstrtoul(cmd + 4, 10, &cpu) == 0) fiq_debugger_switch_cpu(state, cpu); else fiq_debugger_printf(&state->output, "invalid cpu\n"); @@ -1144,7 +1144,7 @@ static int fiq_debugger_probe(struct platform_device *pdev) if (state->wakeup_irq >= 0) { ret = request_irq(state->wakeup_irq, fiq_debugger_wakeup_irq_handler, - IRQF_TRIGGER_FALLING | IRQF_DISABLED, + IRQF_TRIGGER_FALLING, "debug-wakeup", state); if (ret) { pr_err("serial_debugger: "