From patchwork Fri Jul 21 17:18:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 13322395 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7EC9CEB64DC for ; Fri, 21 Jul 2023 17:19:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229977AbjGURTN (ORCPT ); Fri, 21 Jul 2023 13:19:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229609AbjGURTM (ORCPT ); Fri, 21 Jul 2023 13:19:12 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2FDAD113; Fri, 21 Jul 2023 10:19:11 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BC81761D4E; Fri, 21 Jul 2023 17:19:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B330EC433C7; Fri, 21 Jul 2023 17:19:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689959950; bh=rqQYBDs0vqpTTedyTMN83jkJBaQ/Y93Hskjay6OnuvE=; h=From:To:Cc:Subject:Date:From; b=jdVEybrP7L1EQAa1kFGVahsP7XbxLWeBbHkEQ8/2j3bE72eeqexXMm8SP1NcSl60D wCbHBQ4JNk34vVBUDsYjcrSinMflpatKaF7oI14TremTy6vjygaNlZwiOP7LMkNaDY S1dzMsVWwOFWQTi5dLnPoTlnDeDK33O7snbWY0yA+WFnXXO+7rFdLmuaBj8JX6vCYN Wcuuq9ZkJmfsLkTW2osqaPnpdAd/igwkBvR1ebIneqFLnytg7xKQEHHg2ngaRDyCpF 5IBxefKbLbdw2ZA1TJs7uChNcy6mKCkW5l0/580I6SoZuyJz9WBt5ymX108ThKN+R5 qvEaZWlOrYn0w== From: Masahiro Yamada To: Richard Weinberger , Anton Ivanov , Johannes Berg , linux-um@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org, Jiri Slaby , Masahiro Yamada , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Ingo Molnar , Thomas Gleixner , x86@kernel.org Subject: [PATCH v2 1/2] UML: hard-code the result of 'uname -s' Date: Sat, 22 Jul 2023 02:18:56 +0900 Message-Id: <20230721171857.3612639-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org We rely on 'uname -s' returning 'Linux' because there are os-Linux/ directories, but no other os-*/. Supporting a non-Linux host is unlikely to happen. Let's hard-code 'Linux'. Signed-off-by: Masahiro Yamada --- (no changes since v1) arch/um/Makefile | 7 +++---- arch/x86/um/Makefile | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/um/Makefile b/arch/um/Makefile index da4d5256af2f..1735a562453d 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -18,14 +18,13 @@ else endif ARCH_DIR := arch/um -OS := $(shell uname -s) # We require bash because the vmlinux link and loader script cpp use bash # features. SHELL := /bin/bash core-y += $(ARCH_DIR)/kernel/ \ $(ARCH_DIR)/drivers/ \ - $(ARCH_DIR)/os-$(OS)/ + $(ARCH_DIR)/os-Linux/ MODE_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/shared/skas @@ -78,7 +77,7 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -I%,,$(KBUILD_CFLAGS))) \ -idirafter $(objtree)/include -D__KERNEL__ -D__UM_HOST__ #This will adjust *FLAGS accordingly to the platform. -include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS) +include $(srctree)/$(ARCH_DIR)/Makefile-os-Linux KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/include \ -I$(srctree)/$(HOST_DIR)/include/uapi \ @@ -155,4 +154,4 @@ archclean: @find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \ -o -name '*.gcov' \) -type f -print | xargs rm -f -export HEADER_ARCH SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS DEV_NULL_PATH +export HEADER_ARCH SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING DEV_NULL_PATH diff --git a/arch/x86/um/Makefile b/arch/x86/um/Makefile index ee89f6bb9242..e207e6748aa2 100644 --- a/arch/x86/um/Makefile +++ b/arch/x86/um/Makefile @@ -13,7 +13,7 @@ obj-y = bugs_$(BITS).o delay.o fault.o ldt.o \ ptrace_$(BITS).o ptrace_user.o setjmp_$(BITS).o signal.o \ stub_$(BITS).o stub_segv.o \ sys_call_table_$(BITS).o sysrq_$(BITS).o tls_$(BITS).o \ - mem_$(BITS).o subarch.o os-$(OS)/ + mem_$(BITS).o subarch.o os-Linux/ ifeq ($(CONFIG_X86_32),y) From patchwork Fri Jul 21 17:18:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 13322396 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5F36DC001DC for ; Fri, 21 Jul 2023 17:19:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230457AbjGURTP (ORCPT ); Fri, 21 Jul 2023 13:19:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230451AbjGURTO (ORCPT ); Fri, 21 Jul 2023 13:19:14 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0989F113; Fri, 21 Jul 2023 10:19:13 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9086461D2F; Fri, 21 Jul 2023 17:19:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9483CC433C9; Fri, 21 Jul 2023 17:19:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689959952; bh=ZR06M3d0gZKRb4qFO1k4EYXqLJ5GJPGsvI0z3w1cJFs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rvNmnzl1Nwu+J/6xOdGaUdPqmOhwTHqfFaC3Xk7KzAE4rMXToL7/R3DzDEgIEkiyo dortXv3BM//zgrIWSD06NieLEU6/Y6fYZ7qT1yqPpIqEgPeqF4NsGop3fc+INGGQCs Y4gp+mQLcdjuI+ap/hA+6Is0i7ARKR2QuICuuoTZ0JuJTbqdwbkoXS94rGeihsiblC b3nnNopcsvLnmco09z4Lw0nobnNtlC4yXVxtwv1ngJtdx4EDkgU0EP55zt/l/BrRiK GzdA82oPy0L/zobquahYfr/Cn6YtJsm0JV+glig0tVHHxC3BSRNj5HcR9Dt2dmyDUY RyMakPBm5ZESw== From: Masahiro Yamada To: Richard Weinberger , Anton Ivanov , Johannes Berg , linux-um@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org, Jiri Slaby , Masahiro Yamada Subject: [PATCH v2 2/2] UML: use obj-y to descend into arch/um/*/ Date: Sat, 22 Jul 2023 02:18:57 +0900 Message-Id: <20230721171857.3612639-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230721171857.3612639-1-masahiroy@kernel.org> References: <20230721171857.3612639-1-masahiroy@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org The single build rule does not work with the core-y syntax. [1] Use the standard obj-y syntax. [1]: https://lore.kernel.org/linux-kbuild/d57ba55f-20a3-b836-783d-b49c8a161b6e@kernel.org/T/#m7bc402e1e038f00ebcf2e92ed7fcb8a52fc1ea44 Signed-off-by: Masahiro Yamada Tested-by: Jiri Slaby Reviewed-by: Nick Desaulniers Tested-by: Nick Desaulniers --- Changes in v2: - Rephase the commit log arch/um/Kbuild | 2 ++ arch/um/Makefile | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/um/Kbuild b/arch/um/Kbuild index a4e40e534e6a..6cf0c1e5927b 100644 --- a/arch/um/Kbuild +++ b/arch/um/Kbuild @@ -1 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only + +obj-y += kernel/ drivers/ os-Linux/ diff --git a/arch/um/Makefile b/arch/um/Makefile index 1735a562453d..82f05f250634 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -22,10 +22,6 @@ ARCH_DIR := arch/um # features. SHELL := /bin/bash -core-y += $(ARCH_DIR)/kernel/ \ - $(ARCH_DIR)/drivers/ \ - $(ARCH_DIR)/os-Linux/ - MODE_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/shared/skas HEADER_ARCH := $(SUBARCH)