From patchwork Tue Jun 19 09:43:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 139102 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp4989586lji; Tue, 19 Jun 2018 02:45:52 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLzOE+iN+aEHrAqc75mWdahxDzUZKPTnM+uRD1/mT5MfdvQMqbSxOyJU3QfDm6zV0jJWq2t X-Received: by 2002:a62:2394:: with SMTP id q20-v6mr17281485pfj.1.1529401552294; Tue, 19 Jun 2018 02:45:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529401552; cv=none; d=google.com; s=arc-20160816; b=MCZbbuKIMTu/2OiBgOo5Uy61Hpda2YzUBdcvm1h/BO/WYP+uau8otn/wdOzaeyvpxa rzj5f2OU2MmzOaLjNAJiWwDhtZpkHnsT7vuMqkfwa3P+2FLPMT26VxTe5rl6Kcd6yyo8 4uikADm3lH3dzGp6m8Q28zCm/x5SXigkKMvZOHDF9E2o4TVxlQW/xNTboFpfPBJiT6xQ CnCr1nLzpvtczKzH+NgOia6BCi8rkEEbloDxZkZJwYHmah+uvJrlerIJTntgz2xsnFtn jEWVSOAYL3KJSadX0QOIGQY3TIR6r0h5XFiTwF0rzqYyZNQuhssFDlN/1AqqLnSLmgTe kjow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=YqGuGS0XS1b867FvtzcfzHY5JWMqL5TunvKY9jcybc0=; b=aQ26z/WyGbQX88cuyguhOlTHEc0/Oz1b2xabrwnIWHC/ZkL+FWCKRWhDIJdhJKzd0p OL0XcthA1B476NrmhYMbmFsa3B0UlX/gqoFwMWctzVFHMxOAWy7IbtJkU8GtLFwctim+ IxDYYNGfuoZ2MlJntvdPvalJDgWI3dO28m0M9qRwejNTXAB1FR2KNl4M47C7WNF+cWm8 53FbqQ70RGS2sbj5OhtQe7z1wbdJ/y8SpwsfzkG/JZF35rDrRMxre+rWCuV9E/+6/Esh 22i7xjrTAErin/5EQ4Cp2PKtyBE3W1nioSBFaeJgkkeaLK7O2ykhgoO/aeIspSCBmD6g xBPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=coBYb5DV; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z4-v6si17826181pfl.31.2018.06.19.02.45.51; Tue, 19 Jun 2018 02:45:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=coBYb5DV; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S937558AbeFSJpu (ORCPT + 30 others); Tue, 19 Jun 2018 05:45:50 -0400 Received: from conuserg-11.nifty.com ([210.131.2.78]:64680 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S937535AbeFSJpq (ORCPT ); Tue, 19 Jun 2018 05:45:46 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-11.nifty.com with ESMTP id w5J9i6pw002346; Tue, 19 Jun 2018 18:44:07 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com w5J9i6pw002346 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1529401448; bh=YqGuGS0XS1b867FvtzcfzHY5JWMqL5TunvKY9jcybc0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=coBYb5DVM0jfM1dKnYjhiWWAouHbey6Fs0puHoWAuuL017jeNf9gdY+8mmJvjjxnx 7IYqe3uykgSgJJVLZ0TQpGjZpO0Lue2TUB7ZQTJGId8rNls/8/5Gc2/d//Tgq0T832 kiCFO2SjuYWTavMOB9n79YhQ88RrcHHDyKA0mSWMyqwDJOE8qT095PQaeKR+SiEDmt vmyp4SPaBGa/E01FBmACbnW65q7otYhw7M7FZB1dk3XfHZIGR6YudJGSHwZck07kPL rj6ChxtjYKG4xtQTIdoFhRE/wIxjQxZh9EPfLykhSmimIJzM/J8IjuANuPADh8gyxo dFBVN5Jn4De2w== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Ingo Molnar , Thomas Gleixner , x86@kernel.org Cc: Sam Ravnborg , Michal Marek , Masahiro Yamada , "H. Peter Anvin" , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] Revert "kexec: purgatory: add clean-up for purgatory directory" Date: Tue, 19 Jun 2018 18:43:41 +0900 Message-Id: <1529401422-28838-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529401422-28838-1-git-send-email-yamada.masahiro@socionext.com> References: <1529401422-28838-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This reverts commit b0108f9e93d0d39050eaa11358852f349bdccb71. Commit b0108f9e93d0 ("kexec: purgatory: add clean-up for purgatory directory") stated that the kexec-purgatory.c and purgatory.ro files were not removed after make mrproper. In fact, they are. You can confirm it after reverting it. $ make mrproper $ touch arch/x86/purgatory/kexec-purgatory.c $ touch arch/x86/purgatory/purgatory.ro $ make mrproper CLEAN arch/x86/purgatory $ ls arch/x86/purgatory/ entry64.S Makefile purgatory.c setup-x86_64.S stack.S string.c This is obvious from the build system point of view. arch/x86/Makefile adds 'arch/x86' to core-y. Hence 'make clean' descends like this: arch/x86/Kbuild -> arch/x86/purgatory/Makefile Signed-off-by: Masahiro Yamada --- arch/x86/Makefile | 1 - 1 file changed, 1 deletion(-) -- 2.7.4 diff --git a/arch/x86/Makefile b/arch/x86/Makefile index f0a6ea2..246a979 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -327,7 +327,6 @@ archclean: $(Q)rm -rf $(objtree)/arch/x86_64 $(Q)$(MAKE) $(clean)=$(boot) $(Q)$(MAKE) $(clean)=arch/x86/tools - $(Q)$(MAKE) $(clean)=arch/x86/purgatory define archhelp echo '* bzImage - Compressed kernel image (arch/x86/boot/bzImage)' From patchwork Tue Jun 19 09:43:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 139103 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp4990016lji; Tue, 19 Jun 2018 02:46:22 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJ5h47QVn8zDoAul7VyUioDuu9XKUynRRsMAX7HWAtBME29sfJnD9KsTLEHPdIlUqrWQiIz X-Received: by 2002:a65:4b04:: with SMTP id r4-v6mr13961740pgq.26.1529401582703; Tue, 19 Jun 2018 02:46:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529401582; cv=none; d=google.com; s=arc-20160816; b=nyD3NDVLVIyjsvkQG3/otzbiFcfggRTsjL+NNkU45s6htKjwGUekUNYt8IAO7NimXv X3BJIpZUPlp+QtcXj7jeb2/W0t4cV65KqQ9DhYt91GVOM0d2N2Il3narBVSMdOb5G6ra Rzolg4o6tIhq8Oj9/tl+ReALcudE6rmlPIBm1a7xuA1EUbeiIm+cUtJMfmwyr1WE+ilr hS7GPcWaGTVQ+fNMbxe/ctZUX19EUPx/rcAmy3oZ4sUsmIUJndh8OOCTaiwJIs0djWZz F1lZtujz8yvWEovU9cSFvteao5QS9rA2x+HUVqI7yrEj/9IWCTsCxFi1dUzYwFz7/Xu5 l9pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=YpndrUOX3Y2iInr6iGjxDqfgacjqhxMhjwpfVWFMako=; b=qQvNQCunPvNkLd6peAnWi8S+fGW8s8aQ7OkFiMSjkWpwit9p8khTwtCNN96N9voUXZ 4EtD9pN94y7byNeeIIdcsZgS8lSgJ7d23ocUzP1Tm1T3iSlH0QseiT8BsflZOLQWZTB4 nWtkx7Bh51EUJJgY8NT5G9aYw/BRmUBshngEBw9E5VJHQFg6hQZ8QWk6S+x8jgN4RXSw NkliA0JMvFrC1D8HorYBzRePmVBNJvwASbV7BcCKFS2vmdB8T0HrwDLnRF5bARWDAlpD RZphLPNEY/wXpQn3qz3vzU2JTipydzS+o1at9poFd5oRgJm+Xll53TPz8AOZJSXwvA59 y8Aw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=TLQs8+4V; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m8-v6si13708717pgq.637.2018.06.19.02.46.22; Tue, 19 Jun 2018 02:46:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=TLQs8+4V; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756947AbeFSJpm (ORCPT + 30 others); Tue, 19 Jun 2018 05:45:42 -0400 Received: from conuserg-11.nifty.com ([210.131.2.78]:64529 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755866AbeFSJpl (ORCPT ); Tue, 19 Jun 2018 05:45:41 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-11.nifty.com with ESMTP id w5J9i6px002346; Tue, 19 Jun 2018 18:44:08 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com w5J9i6px002346 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1529401448; bh=YpndrUOX3Y2iInr6iGjxDqfgacjqhxMhjwpfVWFMako=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TLQs8+4VfC4ZOnttWSElrvykR7K8GJgld9/gw5H5ufms0jxyBWDlfbzt4D9RFEz7F /a9L1wErcipVTCa94/NM+bxum17hoUU9cELvAQLJny945rk4bu7YthI3s7Rsft0B7M 8NhOUtvwZhEvKF+hXvKJSeAGFe6mnvjw4wzIcO+Pt+6+rl4kzSabbqk8T0/9nfYTaZ AdSIUrbXcl47fLy6afUm73+JwUxbpTm4RiCeFC88xQPvI7m0woVtuvzCMXfMmgtfJD cIfmWo5vPH16LgL3pOuimbcDxm3LYVlgogcn5S/xPFk9x3cNj5wlc1DAxPLjZKmg/g VMFWMMHFW6tbg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Ingo Molnar , Thomas Gleixner , x86@kernel.org Cc: Sam Ravnborg , Michal Marek , Masahiro Yamada , "H. Peter Anvin" , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] x86/build: remove unnecessary preparation for purgatory Date: Tue, 19 Jun 2018 18:43:42 +0900 Message-Id: <1529401422-28838-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529401422-28838-1-git-send-email-yamada.masahiro@socionext.com> References: <1529401422-28838-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org kexec-purgatory.c is properly generated when Kbuild descend into the arch/x86/purgatory/. The archprepare target is redundant. Signed-off-by: Masahiro Yamada --- arch/x86/Makefile | 5 ----- 1 file changed, 5 deletions(-) -- 2.7.4 diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 246a979..a08e828 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -258,11 +258,6 @@ archscripts: scripts_basic archheaders: $(Q)$(MAKE) $(build)=arch/x86/entry/syscalls all -archprepare: -ifeq ($(CONFIG_KEXEC_FILE),y) - $(Q)$(MAKE) $(build)=arch/x86/purgatory arch/x86/purgatory/kexec-purgatory.c -endif - ### # Kernel objects