diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2005-06-27 08:34:27 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2005-10-29 19:31:31 +0100 |
| commit | 01d42abdf3c35c2ae820bb9305174aa75492975b (patch) | |
| tree | 15a05fd40bdbc705bab461e55eec423256085e75 | |
| parent | c4559f67b73d6c34fde0faac5c6c890a2cf3527c (diff) | |
| download | op-kernel-dev-01d42abdf3c35c2ae820bb9305174aa75492975b.zip op-kernel-dev-01d42abdf3c35c2ae820bb9305174aa75492975b.tar.gz | |
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>
| -rw-r--r-- | arch/mips/sgi-ip27/ip27-console.c | 4 |
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 d97f5b5..3e1ac29 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; } |
