Using get_nasid() to find the console node will blow up nicely if


called on a another node than the console node, so use the master_nasid
instead and in the unlikely case that one isn't initialized yet, fall
back to get_nasid().

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

parent c4559f67

arch/mips/sgi-ip27/ip27-console.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -30,8 +30,10 @@
		static inline struct ioc3_uartregs *console_uart(void)
		{
		struct ioc3 *ioc3;
		nasid_t nasid;

		ioc3 = (struct ioc3 *)KL_CONFIG_CH_CONS_INFO(get_nasid())->memory_base;
		nasid = (master_nasid == INVALID_NASID) ? get_nasid() : master_nasid;
		ioc3 = (struct ioc3 *)KL_CONFIG_CH_CONS_INFO(nasid)->memory_base;

		return &ioc3->sregs.uarta;
		}