From a64cf2cdf269c1e475c915a8aae0ca5c71385f7e Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Mon, 27 Jun 2005 08:34:27 +0000 Subject: [PATCH] --- yaml --- r: 11118 b: refs/heads/master c: 01d42abdf3c35c2ae820bb9305174aa75492975b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mips/sgi-ip27/ip27-console.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4539c17e4300..09b9b15fff7e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c4559f67b73d6c34fde0faac5c6c890a2cf3527c +refs/heads/master: 01d42abdf3c35c2ae820bb9305174aa75492975b diff --git a/trunk/arch/mips/sgi-ip27/ip27-console.c b/trunk/arch/mips/sgi-ip27/ip27-console.c index d97f5b5ef844..3e1ac299b804 100644 --- a/trunk/arch/mips/sgi-ip27/ip27-console.c +++ b/trunk/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; }