From 9c91d1aa8df6e651e01c66c5edd09634cd30fdf8 Mon Sep 17 00:00:00 2001 From: Yoshinori Sato Date: Sun, 21 Apr 2019 16:02:23 +0900 Subject: [PATCH] fix issue --- arch/rx/boot/dts/rx_sim.dts | 4 ++-- arch/rx/include/asm/irqflags.h | 2 +- arch/rx/kernel/head.S | 2 +- arch/rx/kernel/setup.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/rx/boot/dts/rx_sim.dts b/arch/rx/boot/dts/rx_sim.dts index fd94fa9c691e..2cd76bfab856 100644 --- a/arch/rx/boot/dts/rx_sim.dts +++ b/arch/rx/boot/dts/rx_sim.dts @@ -81,7 +81,7 @@ sci0: serial@00088240 { compatible = "renesas,sci"; reg = <0x00088240 8>; - interrupts = <214 0>, <215 0>, <216 0>, <217 0>; + interrupts = <214 0>, <215 0>, <216 0>, <0 0>, <0 0>, <217 0>; clocks = <&pclk>; clock-names = "sci_ick"; }; @@ -89,7 +89,7 @@ sci1: serial@00088248 { compatible = "renesas,sci"; reg = <0x00088248 8>; - interrupts = <218 0>, <219 0>, <220 0>, <221 0>; + interrupts = <218 0>, <219 0>, <220 0>, <0 0>, <0 0>, <221 0>; clocks = <&pclk>; clock-names = "sci_ick"; }; diff --git a/arch/rx/include/asm/irqflags.h b/arch/rx/include/asm/irqflags.h index 9c1f50ca0c74..74b648332eee 100644 --- a/arch/rx/include/asm/irqflags.h +++ b/arch/rx/include/asm/irqflags.h @@ -38,7 +38,7 @@ static inline void arch_local_irq_restore(unsigned long iflag) static inline int arch_irqs_disabled_flags(unsigned long psw) { - return (psw & 0x10000) == 0; + return (psw & (1 << 16)) == 0; } static inline int arch_irqs_disabled(void) diff --git a/arch/rx/kernel/head.S b/arch/rx/kernel/head.S index c788433fdb98..e93f4db0a783 100644 --- a/arch/rx/kernel/head.S +++ b/arch/rx/kernel/head.S @@ -16,7 +16,7 @@ .section .head.text,"ax" startup: mov.l #CONFIG_INITIAL_STACK,r0 -#if !defined(CONFIG_RX_GDB_SIM) || 1 +#if !defined(CONFIG_RX_GDB_SIM) #if defined(CONFIG_ROMKERNEL) mov.l #setup_bsc,r1 jsr r1 diff --git a/arch/rx/kernel/setup.c b/arch/rx/kernel/setup.c index b285a013b13a..11c72753253e 100644 --- a/arch/rx/kernel/setup.c +++ b/arch/rx/kernel/setup.c @@ -170,7 +170,7 @@ const struct seq_operations cpuinfo_op = { static int __init device_probe(void) { - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_default_populate(NULL, NULL, NULL); return 0; } -- 2.11.0