Received: by 2002:ac0:98c7:0:0:0:0:0 with SMTP id g7-v6csp608248imd; Thu, 1 Nov 2018 02:37:45 -0700 (PDT) X-Google-Smtp-Source: AJdET5eob+mNd9pqojQd+W957T5RpHu2sCrmJsvCQl7n+zz9HkbyZTy8EVU87l7UnB5PrBaV0ULo X-Received: by 2002:a62:b90f:: with SMTP id z15-v6mr7101330pfe.171.1541065065507; Thu, 01 Nov 2018 02:37:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1541065065; cv=none; d=google.com; s=arc-20160816; b=i1gUPjBAp0pLwN70sJfjlpkR+bKRZpYfIFouguhqiJidfHGRARaft3VAIP1OWasp3I cIXVUQ5hf69Ql7nev038zlVgDgZ6ZAF/mJ3heG28QLVqSGcP+nVQROfeSqdQrvrLbHFJ 4heFjnRX+xLxsGZ/YqMCBobI2Koht34NnkbeJ2NMsKmhhDV76lGvAD67AnyqaqRgooQr B49jF69vZg+RIX4mCnzG7sBqaXBYiBt8TaVf3zqeedRUng/jkzznNSmxDVxixQm890wn lSl5YjiQPJHFppPNLPAfQLiHsoTrayUBi8vZwQn0i3wdvOESgqO9CViQnuURfDveI6BO QSuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :message-id:in-reply-to:subject:cc:to:from:date; bh=DAy1N+9raBoHicRgJvlyyPKSKy3h54VZC78bEAeJsLg=; b=GN757L2xJShRlHSxNtoxj0lcZTeCxvOhcIzrmy0V11eK6D7gF+EG7PpFZ4yIQTAmab rhwUc5tN2cnelZrOBP1E6w5egGa7ADGI/VMThfXs8nwk9ia5ubbmCoYqOwKW2IMqmg8I wJlJvag7J+LwRMPKn7q+EcNYBtb5fTnO6sVZp2hjIaCOqf7YTxWfPRM9n39pHf8oJALf jqxKRZ+XbHhn+tnyOzq5qA5rtvqVilL30Mq1FzHcJeHKHs7+KLKV/hy4EtVLE4HWFiSa 5oN/c4rR11niZ0uIswKq1G9IOEMscUIk8W3PiNmYGRKGSVOYk9ABf7EAOIBjIfhUZkoi V6lw== 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 31-v6si2994853pgl.64.2018.11.01.02.37.30; Thu, 01 Nov 2018 02:37:45 -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 S1727950AbeKASjT (ORCPT + 99 others); Thu, 1 Nov 2018 14:39:19 -0400 Received: from Galois.linutronix.de ([146.0.238.70]:57148 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725800AbeKASjS (ORCPT ); Thu, 1 Nov 2018 14:39:18 -0400 Received: from p5492fe24.dip0.t-ipconnect.de ([84.146.254.36] helo=nanos) by Galois.linutronix.de with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1gI9PH-0001aj-OX; Thu, 01 Nov 2018 10:36:51 +0100 Date: Thu, 1 Nov 2018 10:36:51 +0100 (CET) From: Thomas Gleixner To: Randy Dunlap cc: Andrew Morton , broonie@kernel.org, mhocko@suse.cz, Stephen Rothwell , linux-next@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, LKML , mm-commits@vger.kernel.org, Ravikiran Thirumalai , Shai Fultheim , X86 ML Subject: [PATCH] x86/build: Build VSMP support only if selected In-Reply-To: <9e14d183-55a4-8299-7a18-0404e50bf004@infradead.org> Message-ID: References: <20181030230905.xHZmM%akpm@linux-foundation.org> <9e14d183-55a4-8299-7a18-0404e50bf004@infradead.org> User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org VSMP support is built even if CONFIG_X86_VSMP is not set. This leads to a build breakage when CONFIG_PCI is disabled as well. Build VSMP code only when selected. Reported-by: Randy Dunlap Signed-off-by: Thomas Gleixner --- diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h index ae13bc974416..b6b911c4c7f3 100644 --- a/arch/x86/include/asm/setup.h +++ b/arch/x86/include/asm/setup.h @@ -33,7 +33,7 @@ extern u64 relocated_ramdisk; /* Interrupt control for vSMPowered x86_64 systems */ -#ifdef CONFIG_X86_64 +#if defined(CONFIG_X86_64) && defined(CONFIG_X86_VSMP) void vsmp_init(void); #else static inline void vsmp_init(void) { } diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 8824d01c0c35..647ce52b17d5 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -148,5 +148,5 @@ ifeq ($(CONFIG_X86_64),y) obj-$(CONFIG_CALGARY_IOMMU) += pci-calgary_64.o tce_64.o obj-$(CONFIG_MMCONF_FAM10H) += mmconf-fam10h_64.o - obj-y += vsmp_64.o + obj-$(CONFIG_X86_VSMP) += vsmp_64.o endif