[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20191024225838.27743-3-paul.walmsley@sifive.com>
Date: Thu, 24 Oct 2019 15:58:34 -0700
From: Paul Walmsley <paul.walmsley@...ive.com>
To: linux-riscv@...ts.infradead.org
Cc: linux-kernel@...r.kernel.org, hch@....dev, greentime.hu@...ive.com,
luc.vanoostenryck@...il.com, Christoph Hellwig <hch@....de>,
Anup Patel <anup.patel@....com>
Subject: [PATCH v4 2/6] riscv: init: merge split string literals in preprocessor directive
sparse complains loudly when string literals associated with
preprocessor directives are split into multiple, separately quoted
strings across different lines:
arch/riscv/mm/init.c:341:9: error: Expected ; at the end of type declaration
arch/riscv/mm/init.c:341:9: error: got "not use absolute addressing."
arch/riscv/mm/init.c:358:9: error: Trying to use reserved word 'do' as identifier
arch/riscv/mm/init.c:358:9: error: Expected ; at end of declaration
[ ... ]
It turns out this doesn't compile. The existing Linux practice for
this situation is simply to use a single long line. So, fix by
concatenating the strings.
This patch should have no functional impact.
This version incorporates changes based on feedback from Luc Van
Oostenryck <luc.vanoostenryck@...il.com>.
Signed-off-by: Paul Walmsley <paul.walmsley@...ive.com>
Reviewed-by: Luc Van Oostenryck <luc.vanoostenryck@...il.com>
Reviewed-by: Christoph Hellwig <hch@....de>
Link: https://lore.kernel.org/linux-riscv/CAAhSdy2nX2LwEEAZuMtW_ByGTkHO6KaUEvVxRnba_ENEjmFayQ@mail.gmail.com/T/#mc1a58bc864f71278123d19a7abc083a9c8e37033
Fixes: 387181dcdb6c1 ("RISC-V: Always compile mm/init.c with cmodel=medany and notrace")
Cc: Anup Patel <anup.patel@....com>
---
arch/riscv/mm/init.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index 07af7b1e4069..573463d1c799 100644
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@ -339,8 +339,7 @@ static uintptr_t __init best_map_size(phys_addr_t base, phys_addr_t size)
*/
#ifndef __riscv_cmodel_medany
-#error "setup_vm() is called from head.S before relocate so it should "
- "not use absolute addressing."
+#error "setup_vm() is called from head.S before relocate so it should not use absolute addressing."
#endif
asmlinkage void __init setup_vm(uintptr_t dtb_pa)
--
2.24.0.rc0
Powered by blists - more mailing lists