From patchwork Tue Sep 8 15:25:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 264253 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 49337C433E2 for ; Tue, 8 Sep 2020 18:29:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1236A2087C for ; Tue, 8 Sep 2020 18:29:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599589771; bh=MWldclkLT2ejU4gXw1s6mzAyfj9BbJJiTX74FrTI57g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=D/+MPrGE8noM/C4ZPnGvAYtvaeekV3PX0cli07eGPU5Mhuet13jsiHW8nCEPIcBKm C/UrioGFBUt9oy/0YTWP4XiGcin1MPO/IMxxN7G2rCFdeJHXDiZ9kWiCUDjlFfrg0h lE3o1AGlNzUVHJxHIyLf+XO9Y2xWvj4PYe/kMNAo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731568AbgIHS2o (ORCPT ); Tue, 8 Sep 2020 14:28:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:55374 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731398AbgIHQKZ (ORCPT ); Tue, 8 Sep 2020 12:10:25 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E377524691; Tue, 8 Sep 2020 15:50:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599580226; bh=MWldclkLT2ejU4gXw1s6mzAyfj9BbJJiTX74FrTI57g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gfFrKDDEmwukjOs73bhZmLVJzOH5YLoGJCJfOD3japPcr7QagkoabHYi62CdX+jBb 0W33eFJAMMmFAf1VBruOWsgueHXvQu26t5/4Nct1SgbnVfSs66O+pzsJTY2qBNONgf Gu/jhCn0Nu1+8AYV/Q7psuvtRbaf3D/g5Y2Uo7MI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jason Gunthorpe , Andrew Morton , Linus Torvalds , Sasha Levin Subject: [PATCH 4.19 51/88] include/linux/log2.h: add missing () around n in roundup_pow_of_two() Date: Tue, 8 Sep 2020 17:25:52 +0200 Message-Id: <20200908152223.678299437@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200908152221.082184905@linuxfoundation.org> References: <20200908152221.082184905@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jason Gunthorpe [ Upstream commit 428fc0aff4e59399ec719ffcc1f7a5d29a4ee476 ] Otherwise gcc generates warnings if the expression is complicated. Fixes: 312a0c170945 ("[PATCH] LOG2: Alter roundup_pow_of_two() so that it can use a ilog2() on a constant") Signed-off-by: Jason Gunthorpe Signed-off-by: Andrew Morton Link: https://lkml.kernel.org/r/0-v1-8a2697e3c003+41165-log_brackets_jgg@nvidia.com Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- include/linux/log2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/log2.h b/include/linux/log2.h index 2af7f77866d03..78496801cddf0 100644 --- a/include/linux/log2.h +++ b/include/linux/log2.h @@ -177,7 +177,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n) #define roundup_pow_of_two(n) \ ( \ __builtin_constant_p(n) ? ( \ - (n == 1) ? 1 : \ + ((n) == 1) ? 1 : \ (1UL << (ilog2((n) - 1) + 1)) \ ) : \ __roundup_pow_of_two(n) \