Commit b75d5a59 authored by Philippe Gerum's avatar Philippe Gerum
Browse files

arm64/ipipe: fix conditional definition of __ipipe_serial_debug()

parent b92803f6
......@@ -280,8 +280,7 @@ static inline void ipipe_handle_multi_ipi(int irq, struct pt_regs *regs)
#endif /* CONFIG_SMP */
#endif /* CONFIG_IPIPE */
#if defined (CONFIG_IPIPE_DEBUG) && \
(defined(CONFIG_DEBUG_LL) || defined(CONFIG_SERIAL_8250_CONSOLE))
#ifdef CONFIG_IPIPE_DEBUG
void __ipipe_serial_debug(const char *fmt, ...);
#else
#define __ipipe_serial_debug(fmt, args...) do { } while (0)
......
......@@ -2169,6 +2169,8 @@ static int __init pl011_early_console_setup(struct earlycon_device *device,
EARLYCON_DECLARE(pl011, pl011_early_console_setup);
OF_EARLYCON_DECLARE(pl011, "arm,pl011", pl011_early_console_setup);
#ifdef CONFIG_IPIPE_DEBUG
static IPIPE_DEFINE_SPINLOCK(ipipe_amba_lock);
#include <linux/nmi.h>
......@@ -2220,6 +2222,8 @@ void __ipipe_serial_debug(const char *fmt, ...)
spin_unlock_irqrestore(&ipipe_amba_lock, flags);
}
#endif /* CONFIG_IPIPE_DEBUG */
#else
#define AMBA_CONSOLE NULL
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment