From patchwork Tue Jul 24 17:56:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 948694 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-um-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="G8dDGyPy"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41ZmJr5G4Lz9s21 for ; Wed, 25 Jul 2018 03:57:00 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=oZqBXHZpzznHC/8+XRTdsIJ2LChNsviGwo5PB+a3H1w=; b=G8dDGyPyjJs4NbbRyteoNUt3rI +0RhKqUWWLI5UXc5o9/wUVjtzM3f+twAf+ViHcUhpWdiP/J2nJobCDqnLoUIx6CpVYnj1cV6owLde Xh5+FQQWQvbnEUh3+XuItgZUhQtZx6p0KAj7QnqnKmZke36AQmk6dgrgPLCBR/o0U8/yvui8n9c1Q Gz+gQ+ZF9paQwVBNZNBslYZLsiX4L3Cd40+vR8bl4JVYWR7jP/OEjM3ij6+YlOT9V7ON5EE7Y7KZN 8oVr1Y8pgzNs/Z63ihxNWz4Aa5CCr7WIlHkmSmxb8glEd8JI4xoyHNGay0OorIUuZWoZUnG6cdbIz Ct3gAC+Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fi1YM-00073h-49; Tue, 24 Jul 2018 17:56:54 +0000 Received: from 089144194224.atnat0003.highway.a1.net ([89.144.194.224] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fi1YL-000736-2B; Tue, 24 Jul 2018 17:56:53 +0000 From: Christoph Hellwig To: Masahiro Yamada Subject: [PATCH 01/10] um: stop abusing KBUILD_KCONFIG Date: Tue, 24 Jul 2018 19:56:37 +0200 Message-Id: <20180724175646.3621-2-hch@lst.de> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180724175646.3621-1-hch@lst.de> References: <20180724175646.3621-1-hch@lst.de> X-BeenThere: linux-um@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michal Simek , linux-kbuild@vger.kernel.org, Richard Weinberger , Randy Dunlap , linux-um@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arch@lists.infradead.org, Ley Foon Tan MIME-Version: 1.0 Sender: "linux-um" Errors-To: linux-um-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Instead create a arch/um/Kconfig file that just includes the actual per-arch Kconfig file. Signed-off-by: Christoph Hellwig Acked-by: Richard Weinberger --- arch/um/Kconfig | 3 +++ arch/um/Makefile | 2 -- arch/x86/um/Kconfig | 5 ----- 3 files changed, 3 insertions(+), 7 deletions(-) create mode 100644 arch/um/Kconfig diff --git a/arch/um/Kconfig b/arch/um/Kconfig new file mode 100644 index 000000000000..24607af202dc --- /dev/null +++ b/arch/um/Kconfig @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +source "arch/$(SUBARCH)/um/Kconfig" diff --git a/arch/um/Makefile b/arch/um/Makefile index e54dda8a0363..0207f6316d71 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -113,8 +113,6 @@ define archhelp echo ' find in the kernel root.' endef -KBUILD_KCONFIG := $(HOST_DIR)/um/Kconfig - archheaders: $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \ kbuild-file=$(HOST_DIR)/include/asm/Kbuild \ diff --git a/arch/x86/um/Kconfig b/arch/x86/um/Kconfig index 9d529f22fd9d..7e509c83d80d 100644 --- a/arch/x86/um/Kconfig +++ b/arch/x86/um/Kconfig @@ -1,9 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -mainmenu "User Mode Linux/$(SUBARCH) $(KERNELVERSION) Kernel Configuration" - -comment "Compiler: $(CC_VERSION_TEXT)" - -source "scripts/Kconfig.include" source "arch/um/Kconfig.common"