Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp1997034imu; Fri, 14 Dec 2018 04:15:21 -0800 (PST) X-Google-Smtp-Source: AFSGD/Ur5xS2Q36opAwXlJawbG1rsLztLaKpQhUVdUTDzDhRvkrGjAZ4TVlcxe6HKvC9LkMidnIC X-Received: by 2002:a63:5455:: with SMTP id e21mr2542793pgm.316.1544789721633; Fri, 14 Dec 2018 04:15:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544789721; cv=none; d=google.com; s=arc-20160816; b=IvuaquLkFEG17ZVbnrDNSEKW8/FGPFMDbhXY+Uv4t4SBfz9caXy78Ai8ocWNCuqB7w 629iTfuHOYjU24wuuzWuSV++gagQsHMfsyF4WAa9OttuUnV275ESqoUttajOAIpCzTAf 1+01skI46T4wHQi4QtqxLypI/NxmbrcX48oizlqCmeAjfS3W0p5QktDjFOLIJT9W9FKn 8aUCzGRUhInx4YlPUmHlDzBevdChBWwUJ1yayR+A8fNZg7ktPebYCnDASZ0ytVVmEk2A MbrOGWZSQ5fBF8OU57wMU/jzowh/V0DoZwprekMJP73gw5udNO1PcGtn0VoGjOGeecnx cSiA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=GoFCa88xDs13iwx5iSBp+SUl/qlsKeDHIGwYvsvVlYs=; b=EOqJIgrE7ne6eWoV9xgGzaD1UJpf/VZyTXk1bcwxA8fRN3J74mWkPPbkbNgG0jLdRg qlv5cQID4pqtdH+drWM3twajidc3mgXCrtKYKAaWRS1a792OfBte9I+XcZ/mYA6r2+eP hL88/RjDMSPZ/rW8g6WJu3/io59kDJ9En1o1dsnnnyM3EQ/4whdpQf7ogtUWO4AudmBm HSi7V7G5CmsWOmJYYxv537dmfa4FWBMGt4/BqaVyd1Xu0ZjLGDkzNGNHyh/mR+uMTj57 GtuZXQMhaYF5fCmSCrvwWD2u3NP4IUD+4qs1QBMA+9KJwUFUDlzoG2xTqGfqjoSzT9A1 EKPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=w5trrtRp; 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 e13si3855096pfi.271.2018.12.14.04.15.06; Fri, 14 Dec 2018 04:15:21 -0800 (PST) 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; dkim=pass header.i=@kernel.org header.s=default header.b=w5trrtRp; 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 S1731803AbeLNMOU (ORCPT + 99 others); Fri, 14 Dec 2018 07:14:20 -0500 Received: from mail.kernel.org ([198.145.29.99]:33892 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731429AbeLNMOR (ORCPT ); Fri, 14 Dec 2018 07:14:17 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (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 D2C6F214DE; Fri, 14 Dec 2018 12:14:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544789656; bh=SKY9M4NoCHPG2FHn4/esDtedDSh9+Q/wF3msCt+0yyc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=w5trrtRpHMc90wtFk3k1PM2Qx0VXcoo9SmvehBHKg67H7IWXGKwRY4ZThX8DKdSmk hXrwjdedWyGSLgikOyfyzM22vsKrUL+lpEEN18LfJcwDlGoi4RAX7onSFThL0hUsQ8 02kL3cVCo6hBU2Y5y4sQyMv+FMrDX186IPulC3YI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yi Wang , Paolo Bonzini , Sasha Levin Subject: [PATCH 4.4 26/88] KVM: x86: fix empty-body warnings Date: Fri, 14 Dec 2018 13:00:00 +0100 Message-Id: <20181214115704.251085182@linuxfoundation.org> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20181214115702.151309521@linuxfoundation.org> References: <20181214115702.151309521@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 354cb410d87314e2eda344feea84809e4261570a ] We get the following warnings about empty statements when building with 'W=1': arch/x86/kvm/lapic.c:632:53: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body] arch/x86/kvm/lapic.c:1907:42: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body] arch/x86/kvm/lapic.c:1936:65: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body] arch/x86/kvm/lapic.c:1975:44: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body] Rework the debug helper macro to get rid of these warnings. Signed-off-by: Yi Wang Signed-off-by: Paolo Bonzini Signed-off-by: Sasha Levin --- arch/x86/kvm/lapic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index a1afd80a68aa..3c70f6c76d3a 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -56,7 +56,7 @@ #define APIC_BUS_CYCLE_NS 1 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */ -#define apic_debug(fmt, arg...) +#define apic_debug(fmt, arg...) do {} while (0) #define APIC_LVT_NUM 6 /* 14 is the version for Xeon and Pentium 8.4.8*/ -- 2.19.1