Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp3918565ybz; Mon, 4 May 2020 12:07:55 -0700 (PDT) X-Google-Smtp-Source: APiQypLPAYYUtXT5Y3IYVATvVDsb+8cWDzoYiGOrgj+zxuegAU+kJV+OCYeKB3LDd1pwjxXuKahh X-Received: by 2002:a17:906:4e02:: with SMTP id z2mr15857082eju.212.1588619275312; Mon, 04 May 2020 12:07:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588619275; cv=none; d=google.com; s=arc-20160816; b=Y/kb39HWZoUZCPxO4zt3u9AwOfss/gtgIkzRdg7RNnkA3HELome7s6V5aHd3EWavMo 3pZTtPD1bhJZQfxqautaz3WwVQ0e/dbGtOEfNRPKw94zWqj09Ak0m9LYM2/raiEmnfzc QtRAOgaBx1TrgWHXWrC20+jE0UuUFMpP3eYR4oK26ummHyGvdNcuyfw0e0HtNQ+GEsiU L9nROjEPI8Qp/ougMJYzmApOPJEdf5w3z4ecXqBUA5X6WLRdnxqK2CPAWAfvtivZuWRY vkUSTyCt8AEoiKAdPydSpXkJlajZRFi3eHpLBhsAKubRpNsycl6Bw9GnFyzKQJFZAOU4 6Wog== 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=EzcLCASZAn6iJeHSZK1322EGGRiTWgPerx6u9orIsZc=; b=MvkmQDUZbKYEWfSK09I5DcB4etljm+2rK9ItLS4FHSLbHUjDVO0uC6gs6DVxD+LkHI CZrBxLeeVV7xhEIS67anVMycYLhLz/1OlibsjHa1AxduUdfcjKebBsa6ktGNOLIWkD5N WsEV7D12MzSB9ITJ9CegU4c5UTtIlijdCTSlpuax/1QLvPxZ7+Ombk/kn/0mZNdIeX/J lIhoBzlhgWB3575BPpSv9h/beDKBvVAbPvWsj4XfIhqXw0R6JcpIohs0gFo+6Bjg05n7 UC9VPcfYXfSCmn24MpEC6Gas4bhOHVoFy+LsDFoR2FOaYUK/A7zrW9ABgzKkPnLkKhQu g54g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=FM+39DPf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bs10si7321304edb.429.2020.05.04.12.07.30; Mon, 04 May 2020 12:07:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=FM+39DPf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726572AbgEDTFV (ORCPT + 99 others); Mon, 4 May 2020 15:05:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:53206 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726338AbgEDTFU (ORCPT ); Mon, 4 May 2020 15:05:20 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 DE090206B8; Mon, 4 May 2020 19:05:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588619120; bh=aCv1F6E9QThI8vva9EtdscBCQGKHO0zt1VxPt/iOnuQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FM+39DPfhYzon6z5jHCkAmHn44SVhQMQMIZTUIzPmQV7C0U8JxiW2XBN9i/Wiqn7M WVPuiNL0DsifwbVEh8alUx2v9umGlJ1VyJE0BTk0KwADG4X/l0ESsmYUytivx9TKHp 04XIccgKGT+ABFSBYqNCPimn6tDZbzCDNrZD+e5M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lu Baolu , Ashok Raj , Joerg Roedel , Sanjay K Subject: [PATCH 5.6 61/73] iommu/vt-d: Use right Kconfig option name Date: Mon, 4 May 2020 19:58:04 +0200 Message-Id: <20200504165509.860520707@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200504165501.781878940@linuxfoundation.org> References: <20200504165501.781878940@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Lu Baolu commit ba61c3da00f4a5bf8805aeca1ba5ac3c9bd82e96 upstream. The CONFIG_ prefix should be added in the code. Fixes: 046182525db61 ("iommu/vt-d: Add Kconfig option to enable/disable scalable mode") Reported-and-tested-by: Kumar, Sanjay K Signed-off-by: Lu Baolu Cc: Ashok Raj Link: https://lore.kernel.org/r/20200501072427.14265-1-baolu.lu@linux.intel.com Signed-off-by: Joerg Roedel Signed-off-by: Greg Kroah-Hartman --- drivers/iommu/intel-iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -371,11 +371,11 @@ int dmar_disabled = 0; int dmar_disabled = 1; #endif /* CONFIG_INTEL_IOMMU_DEFAULT_ON */ -#ifdef INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON +#ifdef CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON int intel_iommu_sm = 1; #else int intel_iommu_sm; -#endif /* INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON */ +#endif /* CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON */ int intel_iommu_enabled = 0; EXPORT_SYMBOL_GPL(intel_iommu_enabled);