]> git.ipfire.org Git - people/arne_f/kernel.git/commitdiff
openrisc: don't printk() unconditionally
authorRandy Dunlap <rdunlap@infradead.org>
Mon, 19 Jul 2021 02:33:09 +0000 (19:33 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 22 Sep 2021 09:41:23 +0000 (11:41 +0200)
[ Upstream commit 946e1052cdcc7e585ee5d1e72528ca49fb295243 ]

Don't call printk() when CONFIG_PRINTK is not set.
Fixes the following build errors:

or1k-linux-ld: arch/openrisc/kernel/entry.o: in function `_external_irq_handler':
(.text+0x804): undefined reference to `printk'
(.text+0x804): relocation truncated to fit: R_OR1K_INSN_REL_26 against undefined symbol `printk'

Fixes: 9d02a4283e9c ("OpenRISC: Boot code")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: kernel test robot <lkp@intel.com>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
Cc: Stafford Horne <shorne@gmail.com>
Cc: openrisc@lists.librecores.org
Signed-off-by: Stafford Horne <shorne@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/openrisc/kernel/entry.S

index 3fbe420f49c43d34ee27d815355eb55942be6bb5..92cdc1e56b602f228881fb3586f5a46357b5c5d6 100644 (file)
@@ -491,6 +491,7 @@ EXCEPTION_ENTRY(_external_irq_handler)
        l.bnf   1f                      // ext irq enabled, all ok.
        l.nop
 
+#ifdef CONFIG_PRINTK
        l.addi  r1,r1,-0x8
        l.movhi r3,hi(42f)
        l.ori   r3,r3,lo(42f)
@@ -504,6 +505,7 @@ EXCEPTION_ENTRY(_external_irq_handler)
                .string "\n\rESR interrupt bug: in _external_irq_handler (ESR %x)\n\r"
                .align 4
        .previous
+#endif
 
        l.ori   r4,r4,SPR_SR_IEE        // fix the bug
 //     l.sw    PT_SR(r1),r4