Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp588078ybb; Wed, 1 Apr 2020 06:07:33 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuyFaNIMEeueRFcFxUNm2WNpog2y8KLYaWvIOqfTaOf38yz2nNQOInyKBqMqYJKmPxYjiqh X-Received: by 2002:a05:6830:2415:: with SMTP id j21mr16720604ots.93.1585746453598; Wed, 01 Apr 2020 06:07:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585746453; cv=none; d=google.com; s=arc-20160816; b=BXF/Cev96u0ODNeJQkkjbLBUCOv03NuhtgG2G8GyQVmhx4rzTUrCVk39+sGeEaDvmk nlnQ93reIahg6fPfUCpCXOwe9xEJ7ydqrvOPVZIHGvLyvNqK41GckOSZmSof5pBvXJXq YW0sYheJScJG0ErV7n7oua4QU9AQPCl10937q3P6rAoRzYXjBrEESa9haLXSdSJkD6eK cDr/kpsM2Ko9U/XQtQhcwc9mBCPT637lGkv/7tSO20DotM2Seobfon/lhkugByzjYxSB Ycv18DAT/L2t9sG7PX2WlRntTCCBEIPKYJODAK6WHY6r54/gbAmNbxrOjeAce7er5h57 QlkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=G5JdjzZa5ITedq+j/PH/sJZ0qrz3KIfAQthmAJWpR20=; b=NYmqIOW6Ncjf9dqWsroVECnAFJwFJbkSyzipa72EocobcqLLYH46zbovLtf5VI2MTK zoqlkbW0QdcE4b/yRWuDX+IdfSsL/1rwo/MQPxugpG086fUqL+6IU528kkM58oLDSN3s uwHnzz1VMAa4Mq2nWtbTleTe2Y6Gt99BL9fC5GSC7+td9bfl9YeFfFg2lxeZwUX5mSBx 5xT4nLeNZknEFMI/ufg5fvqoVBflYTSSyZQpgb6mZH4qpzGftN/6foIAY+ofdbtopEjU oPHPqEtRvWrdgKAbyKzqt4ZvjSYuWGwNsk5wTRWTFwumPM0uoUd1JvKsnL+onKBb5c/6 BOHg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d125si907614oif.236.2020.04.01.06.07.11; Wed, 01 Apr 2020 06:07:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732511AbgDANGt (ORCPT + 99 others); Wed, 1 Apr 2020 09:06:49 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:33630 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1732252AbgDANGs (ORCPT ); Wed, 1 Apr 2020 09:06:48 -0400 Received: from DGGEMS407-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id C553B6E1EE230E43A9BA; Wed, 1 Apr 2020 21:06:37 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by DGGEMS407-HUB.china.huawei.com (10.3.19.207) with Microsoft SMTP Server id 14.3.487.0; Wed, 1 Apr 2020 21:06:26 +0800 From: Chen Zhou To: , , CC: , , , Subject: [PATCH -next] KVM: PPC: Book3S HV: remove redundant NULL check Date: Wed, 1 Apr 2020 21:09:03 +0800 Message-ID: <20200401130903.6576-1-chenzhou10@huawei.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.113.25] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Free function kfree() already does NULL check, so the additional check is unnecessary, just remove it. Signed-off-by: Chen Zhou --- arch/powerpc/kvm/book3s_hv_nested.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/powerpc/kvm/book3s_hv_nested.c b/arch/powerpc/kvm/book3s_hv_nested.c index dc97e5b..cad3243 100644 --- a/arch/powerpc/kvm/book3s_hv_nested.c +++ b/arch/powerpc/kvm/book3s_hv_nested.c @@ -1416,8 +1416,7 @@ static long int __kvmhv_nested_page_fault(struct kvm_run *run, rmapp = &memslot->arch.rmap[gfn - memslot->base_gfn]; ret = kvmppc_create_pte(kvm, gp->shadow_pgtable, pte, n_gpa, level, mmu_seq, gp->shadow_lpid, rmapp, &n_rmap); - if (n_rmap) - kfree(n_rmap); + kfree(n_rmap); if (ret == -EAGAIN) ret = RESUME_GUEST; /* Let the guest try again */ -- 2.7.4