From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752889AbdJLTXM (ORCPT ); Thu, 12 Oct 2017 15:23:12 -0400 Received: from fldsmtpe03.verizon.com ([140.108.26.142]:46804 "EHLO fldsmtpe03.verizon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751996AbdJLTXL (ORCPT ); Thu, 12 Oct 2017 15:23:11 -0400 From: "Levin, Alexander (Sasha Levin)" Cc: "linux-kernel@vger.kernel.org" , "mhocko@kernel.org" , "Levin, Alexander (Sasha Levin)" X-Host: pioneer.tdc.vzwcorp.com To: "akpm@linux-foundation.org" Subject: [PATCH] kmemcheck: correctly remove kmemcheck call from dma_map_sg_attrs Thread-Topic: [PATCH] kmemcheck: correctly remove kmemcheck call from dma_map_sg_attrs Thread-Index: AQHTQ49jsHqwtxOFoUqGVyI2GYlaXw== Date: Thu, 12 Oct 2017 19:22:05 +0000 Message-ID: <20171012192151.26531-1-alexander.levin@verizon.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.144.60.250] Content-Type: text/plain; charset="iso-8859-1" MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by nfs id v9CJNHAb031727 We have missed removing some code as part of removing the kmemcheck hooks. Unfourtenatly this got missed during my review, and the code was still building. Reported-by: Michal Hocko Signed-off-by: Sasha Levin --- include/linux/dma-mapping.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index 83f3ab31efc4..2911389bc147 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -260,10 +260,8 @@ static inline int dma_map_sg_attrs(struct device *dev, struct scatterlist *sg, unsigned long attrs) { const struct dma_map_ops *ops = get_dma_ops(dev); - int i, ents; - struct scatterlist *s; + int ents; - for_each_sg(sg, s, nents, i) BUG_ON(!valid_dma_direction(dir)); ents = ops->map_sg(dev, sg, nents, dir, attrs); BUG_ON(ents < 0); -- 2.11.0