riscv: prefix IRQ_ macro names with an RV_ namespace
authorPaul Walmsley <paul.walmsley@sifive.com>
Fri, 20 Dec 2019 11:09:49 +0000 (03:09 -0800)
committerPaul Walmsley <paul.walmsley@sifive.com>
Sun, 5 Jan 2020 05:48:59 +0000 (21:48 -0800)
commit2f3035da4019780250658d1ffe486bc324e04805
tree935c1b61ee95876a5dcd39444404f170361f3852
parent9d05c18e8d7de566ff68f221fcae65e78708dd1d
riscv: prefix IRQ_ macro names with an RV_ namespace

"IRQ_TIMER", used in the arch/riscv CSR header file, is a sufficiently
generic macro name that it's used by several source files across the
Linux code base.  Some of these other files ultimately include the
arch/riscv CSR include file, causing collisions.  Fix by prefixing the
RISC-V csr.h IRQ_ macro names with an RV_ prefix.

Fixes: a4c3733d32a72 ("riscv: abstract out CSR names for supervisor vs machine mode")
Reported-by: Olof Johansson <olof@lixom.net>
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Paul Walmsley <paul.walmsley@sifive.com>
arch/riscv/include/asm/csr.h
arch/riscv/kernel/irq.c
drivers/irqchip/irq-sifive-plic.c