Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755487AbcKXG0T (ORCPT ); Thu, 24 Nov 2016 01:26:19 -0500 Received: from terminus.zytor.com ([198.137.202.10]:52790 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754649AbcKXG0S (ORCPT ); Thu, 24 Nov 2016 01:26:18 -0500 Date: Wed, 23 Nov 2016 22:25:48 -0800 From: tip-bot for Dan Carpenter Message-ID: Cc: linux-kernel@vger.kernel.org, travis@sgi.com, nzimmer@sgi.com, mingo@kernel.org, dan.carpenter@oracle.com, sivanich@sgi.com, tglx@linutronix.de, torvalds@linux-foundation.org, peterz@infradead.org, bigeasy@linutronix.de, athorlton@sgi.com, hpa@zytor.com Reply-To: dan.carpenter@oracle.com, mingo@kernel.org, nzimmer@sgi.com, linux-kernel@vger.kernel.org, travis@sgi.com, tglx@linutronix.de, hpa@zytor.com, bigeasy@linutronix.de, athorlton@sgi.com, torvalds@linux-foundation.org, peterz@infradead.org, sivanich@sgi.com In-Reply-To: <20161123221908.GA23997@mwanda> References: <20161123221908.GA23997@mwanda> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/apic/uv: Silence a shift wrapping warning Git-Commit-ID: c4597fd756836a5fb7900f2091797ab564390ad0 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2013 Lines: 49 Commit-ID: c4597fd756836a5fb7900f2091797ab564390ad0 Gitweb: http://git.kernel.org/tip/c4597fd756836a5fb7900f2091797ab564390ad0 Author: Dan Carpenter AuthorDate: Thu, 24 Nov 2016 01:19:08 +0300 Committer: Ingo Molnar CommitDate: Thu, 24 Nov 2016 06:01:05 +0100 x86/apic/uv: Silence a shift wrapping warning '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 Cc: Alex Thorlton Cc: Dimitri Sivanich Cc: Linus Torvalds Cc: Mike Travis Cc: Nathan Zimmer Cc: Peter Zijlstra Cc: Sebastian Andrzej Siewior Cc: Thomas Gleixner 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 --- arch/x86/kernel/apic/x2apic_uv_x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index aeef53c..35690a1 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -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)