From patchwork Tue Mar 31 08:47:44 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 15339 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n2V8n91h007243 for ; Tue, 31 Mar 2009 08:49:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754012AbZCaItH (ORCPT ); Tue, 31 Mar 2009 04:49:07 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753866AbZCaItG (ORCPT ); Tue, 31 Mar 2009 04:49:06 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:52534 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753326AbZCaItF (ORCPT ); Tue, 31 Mar 2009 04:49:05 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 028BD170176; Tue, 31 Mar 2009 17:27:25 +0800 (CST) Received: from fnst.cn.fujitsu.com (localhost.localdomain [127.0.0.1]) by tang.cn.fujitsu.com (8.13.1/8.13.1) with ESMTP id n2V8pOkL019200; Tue, 31 Mar 2009 16:51:25 +0800 Received: from [127.0.0.1] (unknown [10.167.141.76]) by fnst.cn.fujitsu.com (Postfix) with ESMTP id 0E3282914D1; Tue, 31 Mar 2009 16:53:08 +0800 (CST) Message-ID: <49D1D8B0.2090100@cn.fujitsu.com> Date: Tue, 31 Mar 2009 16:47:44 +0800 From: Wei Yongjun User-Agent: Thunderbird 2.0.0.6 (Windows/20070728) MIME-Version: 1.0 To: Avi Kivity , kvm@vger.kernel.org CC: Wei Yongjun Subject: [PATCH] kvm: remove pointless conditional before kfree() Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Remove pointless conditional before kfree(). Signed-off-by: Wei Yongjun --- arch/x86/kvm/x86.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 8ca100a..8fb4c92 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1580,8 +1580,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp, r = -EINVAL; } out: - if (lapic) - kfree(lapic); + kfree(lapic); return r; }