Merge branch 'master'

1 files changed, 3 insertions, 1 deletions

diff --git a/arch/mips/sgi-ip27/ip27-console.c b/arch/mips/sgi-ip27/ip27-console.c
index d97f5b5ef844..3e1ac299b804 100644
--- a/arch/mips/sgi-ip27/ip27-console.c
+++ b/arch/mips/sgi-ip27/ip27-console.c
@@ -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;
 }