All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Randy Dunlap <rdunlap@infradead.org>,
	Richard Weinberger <richard@nod.at>,
	Ley Foon Tan <lftan@altera.com>, Michal Simek <monstr@monstr.eu>,
	linux-kbuild@vger.kernel.org, linux-um@lists.infradead.org,
	linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 01/10] um: stop abusing KBUILD_KCONFIG
Date: Tue, 31 Jul 2018 13:39:26 +0200	[thread overview]
Message-ID: <20180731113935.6105-2-hch@lst.de> (raw)
In-Reply-To: <20180731113935.6105-1-hch@lst.de>

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 <hch@lst.de>
Acked-by: Richard Weinberger <richard@nod.at>
---
 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"
 
-- 
2.18.0


WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de>
To: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: linux-arch@vger.kernel.org, Michal Simek <monstr@monstr.eu>,
	linux-kbuild@vger.kernel.org, Richard Weinberger <richard@nod.at>,
	Randy Dunlap <rdunlap@infradead.org>,
	linux-um@lists.infradead.org, linux-kernel@vger.kernel.org,
	Ley Foon Tan <lftan@altera.com>
Subject: [PATCH 01/10] um: stop abusing KBUILD_KCONFIG
Date: Tue, 31 Jul 2018 13:39:26 +0200	[thread overview]
Message-ID: <20180731113935.6105-2-hch@lst.de> (raw)
In-Reply-To: <20180731113935.6105-1-hch@lst.de>

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 <hch@lst.de>
Acked-by: Richard Weinberger <richard@nod.at>
---
 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"
 
-- 
2.18.0


_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um


  reply	other threads:[~2018-07-31 11:39 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-31 11:39 include architecture Kconfig files from top-level Kconfig v4 Christoph Hellwig
2018-07-31 11:39 ` Christoph Hellwig
2018-07-31 11:39 ` Christoph Hellwig [this message]
2018-07-31 11:39   ` [PATCH 01/10] um: stop abusing KBUILD_KCONFIG Christoph Hellwig
2018-07-31 11:39 ` [PATCH 02/10] um: cleanup Kconfig files Christoph Hellwig
2018-07-31 11:39   ` Christoph Hellwig
2018-07-31 11:39 ` [PATCH 03/10] um: create a proper drivers Kconfig Christoph Hellwig
2018-07-31 11:39   ` Christoph Hellwig
2018-07-31 11:39 ` [PATCH 04/10] kconfig: remove duplicate SWAP symbol defintions Christoph Hellwig
2018-07-31 11:39   ` Christoph Hellwig
2018-07-31 11:39 ` [PATCH 05/10] kconfig: include common Kconfig files from top-level Kconfig Christoph Hellwig
2018-07-31 11:39   ` Christoph Hellwig
2018-07-31 11:39 ` [PATCH 06/10] Kconfig: consolidate the "Kernel hacking" menu Christoph Hellwig
2018-07-31 11:39   ` Christoph Hellwig
2018-07-31 11:39 ` [PATCH 07/10] kconfig: include kernel/Kconfig.preempt from init/Kconfig Christoph Hellwig
2018-07-31 11:39   ` Christoph Hellwig
2018-07-31 11:39 ` [PATCH 08/10] kconfig: use a menu in arch/Kconfig to reduce clutter Christoph Hellwig
2018-07-31 11:39   ` Christoph Hellwig
2018-07-31 11:39 ` [PATCH 09/10] kconfig: move the "Executable file formats" menu to fs/Kconfig.binfmt Christoph Hellwig
2018-07-31 11:39   ` Christoph Hellwig
2018-07-31 11:39 ` [PATCH 10/10] kconfig: add a Memory Management options" menu Christoph Hellwig
2018-07-31 11:39   ` Christoph Hellwig
2018-08-01 23:10 ` include architecture Kconfig files from top-level Kconfig v4 Masahiro Yamada
  -- strict thread matches above, loose matches on Subject: below --
2018-07-24 17:56 include architecture Kconfig files from top-level Kconfig v3 Christoph Hellwig
2018-07-24 17:56 ` [PATCH 01/10] um: stop abusing KBUILD_KCONFIG Christoph Hellwig
2018-07-24 17:56   ` Christoph Hellwig

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180731113935.6105-2-hch@lst.de \
    --to=hch@lst.de \
    --cc=lftan@altera.com \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-um@lists.infradead.org \
    --cc=monstr@monstr.eu \
    --cc=rdunlap@infradead.org \
    --cc=richard@nod.at \
    --cc=yamada.masahiro@socionext.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.