Merge tag 'iwlwifi-for-kalle-2015-01-15' of https://git.kernel.org/pub/scm/linux...

[firefly-linux-kernel-4.4.55.git] / arch / mips / sgi-ip27 / ip27-klnuma.c

diff --git a/arch/mips/sgi-ip27/ip27-klnuma.c b/arch/mips/sgi-ip27/ip27-klnuma.c
index 7a53b1e28a93dfa512da4e5a6dff6f49e9ae9baa..ecbb62f339c5e7876dbb45d83afec579967ea536 100644 (file)
--- a/arch/mips/sgi-ip27/ip27-klnuma.c
+++ b/arch/mips/sgi-ip27/ip27-klnuma.c
@@ -125,8 +125,7 @@ unsigned long node_getfirstfree(cnodeid_t cnode)
 #endif
        offset = PAGE_ALIGN((unsigned long)(&_end)) - loadbase;
        if ((cnode == 0) || (cpu_isset(cnode, ktext_repmask)))
-               return (TO_NODE(nasid, offset) >> PAGE_SHIFT);
+               return TO_NODE(nasid, offset) >> PAGE_SHIFT;
        else
-               return (KDM_TO_PHYS(PAGE_ALIGN(SYMMON_STK_ADDR(nasid, 0))) >>
-                                                               PAGE_SHIFT);
+               return KDM_TO_PHYS(PAGE_ALIGN(SYMMON_STK_ADDR(nasid, 0))) >> PAGE_SHIFT;
 }