From patchwork Mon Mar 9 10:52:17 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eilon Greenstein X-Patchwork-Id: 24184 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id E0DDBDE10F for ; Mon, 9 Mar 2009 21:53:13 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753506AbZCIKxL (ORCPT ); Mon, 9 Mar 2009 06:53:11 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753435AbZCIKxK (ORCPT ); Mon, 9 Mar 2009 06:53:10 -0400 Received: from mms2.broadcom.com ([216.31.210.18]:1828 "EHLO mms2.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753296AbZCIKxJ (ORCPT ); Mon, 9 Mar 2009 06:53:09 -0400 Received: from [10.11.16.99] by mms2.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Mon, 09 Mar 2009 03:53:04 -0700 X-Server-Uuid: D3C04415-6FA8-4F2C-93C1-920E106A2031 Received: by mail-irva-10.broadcom.com (Postfix, from userid 47) id 888942C1; Mon, 9 Mar 2009 03:53:04 -0700 (PDT) Received: from mail-irva-8.broadcom.com (mail-irva-8 [10.11.18.52]) by mail-irva-10.broadcom.com (Postfix) with ESMTP id 6A3D62B0; Mon, 9 Mar 2009 03:53:04 -0700 (PDT) Received: from mail-irva-13.broadcom.com (mail-irva-13.broadcom.com [10.11.16.103]) by mail-irva-8.broadcom.com (MOS 3.7.5a-GA) with ESMTP id HNO82945; Mon, 9 Mar 2009 03:53:02 -0700 (PDT) Received: from [10.185.6.119] (lb-tlvb-eliezer.il.broadcom.com [10.185.6.119]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id B110574D04; Mon, 9 Mar 2009 03:53:00 -0700 (PDT) Subject: [PATCH 2/3] bnx2x: Casting page alignment From: "Eilon Greenstein" To: "David Miller" cc: netdev@vger.kernel.org, "Alex Chiang" , "Bjorn Helgaas" , "Vladislav Zolotarov" Organization: Broadcom Date: Mon, 09 Mar 2009 12:52:17 +0200 Message-ID: <1236595937.11030.13.camel@lb-tlvb-eliezer> MIME-Version: 1.0 X-Mailer: Evolution 2.22.3.1 X-WSS-ID: 65AA2A9A3D41466077-01-01 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Subject: [PATCH 2/3] bnx2x: Casting page alignment Adding a proper cast to the argument of PAGE_ALIGN macro so that the output won't depend on its original type. Without this cast aligned value will be truncated to the size of the argument type. Reported-by: Bjorn Helgaas Signed-off-by: Vladislav Zolotarov Tested-by: Bjorn Helgaas Signed-off-by: Eilon Greenstein --- drivers/net/bnx2x.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- 1.5.6.3 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/bnx2x.h b/drivers/net/bnx2x.h index 15a5cf0..3cf2b92 100644 --- a/drivers/net/bnx2x.h +++ b/drivers/net/bnx2x.h @@ -152,7 +152,7 @@ struct sw_rx_page { #define PAGES_PER_SGE (1 << PAGES_PER_SGE_SHIFT) #define SGE_PAGE_SIZE PAGE_SIZE #define SGE_PAGE_SHIFT PAGE_SHIFT -#define SGE_PAGE_ALIGN(addr) PAGE_ALIGN(addr) +#define SGE_PAGE_ALIGN(addr) PAGE_ALIGN((typeof(PAGE_SIZE))addr) #define BCM_RX_ETH_PAYLOAD_ALIGN 64