From patchwork Tue Jul 31 11:39:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 951558 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="WK6XW+0L"; 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 41fvcj0r3Rz9s3x for ; Tue, 31 Jul 2018 21:40:05 +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=NcRU82p0TvLNHsNuwovJjZY+iV99wKXzbujFhxz3Nh8=; b=WK6XW+0L4ZZrlNN/SRacLlQLVC yvq+NDxGoHKtF9ASkFU2e7O9mBL0nJlbclX8sNhp5zisdTQUATOTZFJYcicZ8rf56YFcZ/xoifExN wCcs+xHfITWIEkWKKoG8YCNtc68fkoQv0gau+CWmbCwhpZ0YdWOIzd8I7Xznn9jOq8FnXX98IYkeC 6Zs9dCiHXdTtPiC4fXlFhOAuJNh6ffi0Po/Lm0XOBliDwJCI7aty3rywsPKruGAGbIrrJc8o00pHx CmuZqS6QT4EyUXxGsfzc8/yXq+jo5wWFYcbHen+R+0PPuLCP4KTj5dBqoX5fHUXcoNLn0PgjlOg/P lZWfcwKg==; 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 1fkT0B-0001Ip-6S; Tue, 31 Jul 2018 11:39:43 +0000 Received: from 089144201224.atnat0010.highway.a1.net ([89.144.201.224] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkT09-0001ID-IR; Tue, 31 Jul 2018 11:39:42 +0000 From: Christoph Hellwig To: Masahiro Yamada Subject: [PATCH 01/10] um: stop abusing KBUILD_KCONFIG Date: Tue, 31 Jul 2018 13:39:26 +0200 Message-Id: <20180731113935.6105-2-hch@lst.de> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180731113935.6105-1-hch@lst.de> References: <20180731113935.6105-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: linux-arch@vger.kernel.org, Michal Simek , linux-kbuild@vger.kernel.org, Richard Weinberger , Randy Dunlap , linux-um@lists.infradead.org, linux-kernel@vger.kernel.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. Note that we use HEADER_ARCH to find the per-arch Kconfig file as that variable already includes the normalization from i386 or x86_64 to x86. Signed-off-by: Christoph Hellwig Acked-by: Richard Weinberger --- arch/um/Kconfig | 3 +++ arch/um/Makefile | 4 +--- arch/x86/um/Kconfig | 5 ----- 3 files changed, 4 insertions(+), 8 deletions(-) create mode 100644 arch/um/Kconfig diff --git a/arch/um/Kconfig b/arch/um/Kconfig new file mode 100644 index 000000000000..76b4a32c9f42 --- /dev/null +++ b/arch/um/Kconfig @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +source "arch/$(HEADER_ARCH)/um/Kconfig" diff --git a/arch/um/Makefile b/arch/um/Makefile index e54dda8a0363..d427bfc6948f 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 \ @@ -176,4 +174,4 @@ endef include/generated/user_constants.h: $(HOST_DIR)/um/user-offsets.s $(call filechk,gen-asm-offsets) -export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS DEV_NULL_PATH +export HEADER_ARCH SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS DEV_NULL_PATH 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"