diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-03-09 07:32:20 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-03-09 07:32:20 +0100 |
commit | fc4c5a3828bdba157f8ea406e1f4ceb75c13039c (patch) | |
tree | e3fc4601f914fa59e70c7534206cf5c2c6ba16d1 /arch/arc/boot/dts/nsim_hs_idu.dts | |
parent | sched/core: Undefine tracepoint creation at the end of core.c (diff) | |
parent | Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost (diff) | |
download | linux-dev-fc4c5a3828bdba157f8ea406e1f4ceb75c13039c.tar.xz linux-dev-fc4c5a3828bdba157f8ea406e1f4ceb75c13039c.zip |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arc/boot/dts/nsim_hs_idu.dts')
-rw-r--r-- | arch/arc/boot/dts/nsim_hs_idu.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arc/boot/dts/nsim_hs_idu.dts b/arch/arc/boot/dts/nsim_hs_idu.dts index 4f98ebf71fd8..ed12f494721d 100644 --- a/arch/arc/boot/dts/nsim_hs_idu.dts +++ b/arch/arc/boot/dts/nsim_hs_idu.dts @@ -15,7 +15,7 @@ interrupt-parent = <&core_intc>; chosen { - bootargs = "earlycon=arc_uart,mmio32,0xc0fc1000,115200n8 console=ttyARC0,115200n8"; + bootargs = "earlycon=arc_uart,mmio32,0xc0fc1000,115200n8 console=ttyARC0,115200n8 print-fatal-signals=1"; }; aliases { |