From patchwork Mon May 4 17:58:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 226333 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7DB5C3A5A9 for ; Mon, 4 May 2020 19:05:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 82264206C0 for ; Mon, 4 May 2020 19:05:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588619121; bh=aCv1F6E9QThI8vva9EtdscBCQGKHO0zt1VxPt/iOnuQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oK2RCfytVTDjn+j0iXFG/vFncTAI6iSDh0qExQmQYIPEYgopsxbFnA/Ae3wqZA6gW UeY3TX3bkFJhwRuF5JjSRyx+jLmD0dV+VM8a/ZZ8SC66hBIMMFdHINsLSyoqPlRj+I XPoa+jZAWIFq6bL+LmztYkh1CDvzQjlwu3k+rVKE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726410AbgEDTFU (ORCPT ); Mon, 4 May 2020 15:05:20 -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 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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);