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: 124038 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp366233vqg; Fri, 21 Jul 2023 10:42:06 -0700 (PDT) X-Google-Smtp-Source: APBJJlHbI8BVnv2mtKnXOcAGUSYz8j1Uc+fe3ofydCL4s7NG8HE/+KnaPAZdRvZg9pM7H7JHDOFa X-Received: by 2002:a17:906:53d0:b0:993:d589:8b75 with SMTP id p16-20020a17090653d000b00993d5898b75mr3099413ejo.2.1689961326315; Fri, 21 Jul 2023 10:42:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689961326; cv=none; d=google.com; s=arc-20160816; b=JfePHcqewHq9LBpRZ3gKupgj2DslBz7cDQ8Q9exjzstOD7UOFJhINb2E+sroDTOcVf 8VZktqMEdfaT+skJN/snGDf5XzXZM4fMeJ6rF03ZujgQES2NxRvtuUQWMFinr9xmoJ+k 5PpR+AdyckLQtR1FevEZdLws51/cNZ8NJh+HSm/Lau+VQfnMqbMH9w2iNGb7WxFqeb8A bkWXVLbw7bpdgZFQK4ItMJWoeIqGXv9yrqDswipTa24v6gVfQn1V0eAKvHgwWYGSgxoe 9H+aQ5/MSN0YHRzO8+uHB1NkvbUyh1xTzkWPphW7+AcRAQmtiK1yb1HaoSHJnf2zSReX CVzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=sbDsoeyT+7XeKa2ePPXzEEkuqGANZtAim7ILqihNILc=; fh=u2nKlT3uMXAl3+CebS00/myqnOHtMKG7LUV1R2CDK9g=; b=xyNTO+oTEoQz+iZWPq9d7PWx3gMJx1sEjNFrVIXwvxaQbZtA9doXc9qdVXzcvymcO5 H/R27+u9RjDJIMkufnSX8kPuD+lu2HOcTPI/kqUwowC1otCB/WUvm7gBmfvH526bOoN7 pg+1RwYeVu2MedRws89/h3XtkwvaWuCMBiqfNo3i9gfPxGZI/cpF1sYZGhI6g5Ps5gkx fF6b6ZoC2pYi62SvsQ8YifuvAdTliUKE8EKhgYQasypjrX4HeBSeDnttzSvNKXknWMdR b4cOjm6LAeZdFQLpyrBpMDL/RBEkv/VXexOf4N7PNUX32U5innCYIh8HotTuf5My8nlE vOew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jdVEybrP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n4-20020a170906840400b0098e1bbc3dadsi2403071ejx.656.2023.07.21.10.41.43; Fri, 21 Jul 2023 10:42:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jdVEybrP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230440AbjGURTN (ORCPT + 99 others); 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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772038413752411485 X-GMAIL-MSGID: 1772052887754525809 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: 124032 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp359070vqg; Fri, 21 Jul 2023 10:29:07 -0700 (PDT) X-Google-Smtp-Source: APBJJlFvi9Qop5673m8h7YNbBDioQTYTDZaG14kCnbmxmkLLWzcRl7NtcjvfiFmU381p/ETQIJ9r X-Received: by 2002:a17:907:7858:b0:994:1844:caec with SMTP id lb24-20020a170907785800b009941844caecmr1764106ejc.77.1689960547490; Fri, 21 Jul 2023 10:29:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689960547; cv=none; d=google.com; s=arc-20160816; b=zdOGsfIc1mICcMWEuSn/MXCusFYTE+nkDLU8/Byml+LJsmJRxyY1Mm0q3Be0BDinlO p2dcKlmlcotj8Bcnm1ZR8K8lngjx1ji2IaFIAt1aTqJ1FiQvGFtvzvWkxJ1UwiYE2kpK OadYimRa+4/rcqIgDou2AupbSzRU/I8ORQ6x8o/9qo7+CzBIScl7ZDUSXMgm+2Vqbj08 2BhfJBS66h6XllN79zBFa31z/yPyeQ4O8NLGnhLQCTyOkszkN+2tFh3jvdhj2/XB2Ueb p+tDDWz83Cs1LSO5j17wI9xAgImmk1wLxBkzx3exargF8/S002cZsAzuTZf/sjm5uhnT lGrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=eEdTExJyTTc+QrA5jWMJ0cKFR2t9ub65Mmpa5RctDBc=; fh=2nfwCI5CoVlFpxm5b4l0G1pYWczuQdKinyalG8qtGgw=; b=OG9v5aRddALHsqLt+HvmXIIPQRIZZZuOMbrYz8T7FKhTVV8PROaHUt49y17aWeyOy5 TSFsYD7TEURns9GrVtsJOdT045y1P4Or9Wt2nl8b9fdWgjUDPmx50oj0XM6z26c2aGNw 6iPKHB5eLpksga6BOCiXKP+6NPUAfrHpYNfHWiDXHaXERkXeqvCQLeUJ35zu4n/eVaS4 3OInCD46XK6gyNvSAUvS8MUQ+MrkiKXLbEBomazMNIvX0TNkRP8kqs+2EkDlYUByBf0r NAZrymcCB4q+yQLh9DpHw0SsrkwshdOlN7+QTcOIqIqEBV0DnVwI5oHmz4lgMCTsz0iF vwCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rvNmnzl1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id re2-20020a170906d8c200b00988afd7e58asi2469096ejb.350.2023.07.21.10.28.42; Fri, 21 Jul 2023 10:29:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rvNmnzl1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230495AbjGURTQ (ORCPT + 99 others); Fri, 21 Jul 2023 13:19:16 -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 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772052071068332533 X-GMAIL-MSGID: 1772052071068332533 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)