x86/apic/uv: Silence a shift wrapping warning
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 23 Nov 2016 22:19:08 +0000 (01:19 +0300)
committerIngo Molnar <mingo@kernel.org>
Thu, 24 Nov 2016 05:01:05 +0000 (06:01 +0100)
'm_io' is stored in 6 bits so it's a number in the 0-63 range.  Static
analysis tools complain that 1 << 63 will wrap so I have changed it to
1ULL << m_io.

This code is over three years old so presumably the bug doesn't happen
very frequently in real life or someone would have complained by now.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Alex Thorlton <athorlton@sgi.com>
Cc: Dimitri Sivanich <sivanich@sgi.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Travis <travis@sgi.com>
Cc: Nathan Zimmer <nzimmer@sgi.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: kernel-janitors@vger.kernel.org
Fixes: b15cc4a12bed ("x86, uv, uv3: Update x2apic Support for SGI UV3")
Link: http://lkml.kernel.org/r/20161123221908.GA23997@mwanda
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/apic/x2apic_uv_x.c

index aeef53ce93e1ca999e77c2f174c6a06f17353362..35690a168cf7491d960b34c978a9125bba78c6a0 100644 (file)
@@ -815,9 +815,9 @@ static __init void map_mmioh_high_uv3(int index, int min_pnode, int max_pnode)
                                l = li;
                        }
                        addr1 = (base << shift) +
-                               f * (unsigned long)(1 << m_io);
+                               f * (1ULL << m_io);
                        addr2 = (base << shift) +
-                               (l + 1) * (unsigned long)(1 << m_io);
+                               (l + 1) * (1ULL << m_io);
                        pr_info("UV: %s[%03d..%03d] NASID 0x%04x ADDR 0x%016lx - 0x%016lx\n",
                                id, fi, li, lnasid, addr1, addr2);
                        if (max_io < l)