From patchwork Thu Nov 1 09:36:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 10663709 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0461A157A for ; Thu, 1 Nov 2018 09:37:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E92ED2B6B0 for ; Thu, 1 Nov 2018 09:37:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DD2D62B84E; Thu, 1 Nov 2018 09:37:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7ADE22B6B0 for ; Thu, 1 Nov 2018 09:37:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 959476B000D; Thu, 1 Nov 2018 05:37:05 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 908986B000E; Thu, 1 Nov 2018 05:37:05 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7F86B6B0010; Thu, 1 Nov 2018 05:37:05 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by kanga.kvack.org (Postfix) with ESMTP id 25CAA6B000D for ; Thu, 1 Nov 2018 05:37:05 -0400 (EDT) Received: by mail-wr1-f72.google.com with SMTP id v6-v6so12197514wri.23 for ; Thu, 01 Nov 2018 02:37:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:date:from:to :cc:subject:in-reply-to:message-id:references:user-agent :mime-version; bh=DAy1N+9raBoHicRgJvlyyPKSKy3h54VZC78bEAeJsLg=; b=Oh51TrSTfSk/ajsqfggftd1fbTW77TtIKXXvfkPwb1VUgV3NJfQgdFLvd9NfFo9Out X23+emGofte4jf/iqEVwVjRtRDRpszxWrPYdthSEvg8C1+SX+H/BACxFxBBVfPBiiX/e OxIvgbzgT8bmk/yRQTlRO4PUQJIiBek4FcKNn9jEU0F7MR221XY9V00yPy3z5WSi7gM6 Dq8w+pBzLPtRy1pr7MYURWrOSzW+VHts8mnO+1KtxbNo8KA60zM8/iTcD8MGxMuM2WgR 0TI/qH6td8yFYaW3+Q0ylT2PpLDZ2x8yhl9+2eNLGcKyXJTNP3hrUEWgi3aaR0L7mhEA wNNQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of tglx@linutronix.de designates 2a01:7a0:2:106d:700::1 as permitted sender) smtp.mailfrom=tglx@linutronix.de X-Gm-Message-State: AGRZ1gIPUlDN46D+PIrtplQvY0Kn91TUiEOd4ZS7/tNUeiU5g+HECCsE ZSOoBRgUDCrWLhB2Ll2JDFEpoDRMrKfq/6M6M/1OeTIb9GZp2vOmXoyEnpB70Brbi7V3Zqv1GfG 6jELgJEKxA9qzpxvf0Ul47OY/vAzyLCFRrYYxuo5SFOpw29kLHrRkveZ/GXIDYwPBog== X-Received: by 2002:a5d:6551:: with SMTP id z17-v6mr1074788wrv.231.1541065024681; Thu, 01 Nov 2018 02:37:04 -0700 (PDT) X-Google-Smtp-Source: AJdET5fyQPIoRXbl4OJ0bhUP5kWn3Tlmj/BjcqzsuDcf68sVXw1/PpHrpInMmGwugrVUbTPGdfDE X-Received: by 2002:a5d:6551:: with SMTP id z17-v6mr1074755wrv.231.1541065023897; Thu, 01 Nov 2018 02:37:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1541065023; cv=none; d=google.com; s=arc-20160816; b=mUyqaBtT45yKUr78zDPBoIr0PXWqe8TDKHvuD7i1DBe0xJj6eNceGVndv1w1fiSGUE bpAGfzNXKJie50F+N4i0M4V9L/7YYlIelcQLRGLm8wNBGwiLsOBMqeyRe0lWbotyZZrB tPi/e3PrnMXRpBUHj+lXLteV/Uco++eEUvWn+jqTxTPhVhrIBgxvHBS/lWNAd1HMDNfA YOywvQsqWdHlJcs9wE/SuZkvJ6hhv0Zq8Kz5pH0wOF6cfl/WLS3xAPva9Y0G0eI5DZcL CsQBiCiHqtq2iUn15GthW0OtLWyz7Fy0xRCBp9FcRGddwj3JdQoQ+fFUpMMYupaZZeHf nK0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:message-id:in-reply-to:subject :cc:to:from:date; bh=DAy1N+9raBoHicRgJvlyyPKSKy3h54VZC78bEAeJsLg=; b=CGGUXXIL2sD/oLFn4X9nDxagSB2t83/6liHyWoq+M9Ce8TVdtuC6bD+OwBwUPsr/vj lsEyAxR7TiwlujNxb6/CLG7+xB30TY8fF5P+xZfahiCN124FA1IHgByWfwxIErUhFpbG Q/nKSujbRiZPXCXVMi3eGKw6Q8zDV4YmuL0vzsY91w9EjrB2AyHt6fEUVR32jsBy+L0S q+haKEKHnKqwHuMdyCGXHzNBIjF08mgn62CDElCbC3KCylIEFl78g1cIQOewQWU8Plr1 kAHn6L74cq3EQ5nVfsoGy/Hs4eidxu8z9HB0FMAAcE6xN/MWt72HvjT3u22MS3CeBSo+ wS4Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of tglx@linutronix.de designates 2a01:7a0:2:106d:700::1 as permitted sender) smtp.mailfrom=tglx@linutronix.de Received: from Galois.linutronix.de (Galois.linutronix.de. [2a01:7a0:2:106d:700::1]) by mx.google.com with ESMTPS id g16-v6si20005699wrv.174.2018.11.01.02.37.03 for (version=TLS1_2 cipher=AES128-SHA bits=128/128); Thu, 01 Nov 2018 02:37:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of tglx@linutronix.de designates 2a01:7a0:2:106d:700::1 as permitted sender) client-ip=2a01:7a0:2:106d:700::1; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of tglx@linutronix.de designates 2a01:7a0:2:106d:700::1 as permitted sender) smtp.mailfrom=tglx@linutronix.de 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 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 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP 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 Signed-off-by: Eial Czerwacki Acked-by: Shai Fultheim Acked-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