From patchwork Mon Apr 16 14:47: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: 133470 Delivered-To: patch@linaro.org Received: by 10.46.84.18 with SMTP id i18csp3653540ljb; Mon, 16 Apr 2018 07:49:41 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+bHDPI/rhODjZsnVL7nAXP5O5nKOa7z/KM70KxSFC4JreFsiepTchZP1AytswhgzQU65nI X-Received: by 2002:a17:902:7441:: with SMTP id e1-v6mr15627331plt.169.1523890181583; Mon, 16 Apr 2018 07:49:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523890181; cv=none; d=google.com; s=arc-20160816; b=EK+/+QqOqOi6T63vOlkZVUx4OQnyATt4J8Om45brwGs52/anfCwKMmWWzgta9jjYio HK6DBzGvj8yBqnV9mLeMIbcH1lyBUA00tZ/Cmlx/oJ4zr18eJbkluarcjW0qXtdwoyvy q8k3z0M9aKkMYOoqr9bhbAdmREprftnjkWRpR8IjwpdqV3MFPeevWL8rEd+/E+MjfZrZ 7lOyOj2qeJZV770bSVX/4vIKr8HcVfVMd2QYc3hTI1zVkH8Nok13qkSgg0YWuAor4b67 nJ0G9Tp6NR1EvhN1fpnv7ZcwhTfqsqTFJP+uabTwaBNdWGf5vckkAY0iBT8D+yw//9Op rDWw== 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=F06LX9b18Des9LUgr8HfK4zymALQVUMW+ZLKK7UOatg=; b=gWo5jzerfpynqViwxXH2A+FRbY4J80EOOtw0MZoQhjlK7wRk6P3T2mfCi7X0Qo5SN7 r8kgtXDYZW0U3+gxkCDgZHmpidDN8ifl01NcEccX/TC8qqlKslADyvKtbdSi4h8CTc2P XI9eYSWQMtKTZZSI/fapvHIeZcKEZcYyqqyatqh3zYj0/sN0ZPe0TA5fQdjIovYNUEwl zq/oe9VtWTXbcsMv5fGI2v7BLTFMtIYTxxhsouCjQPEGBxZ4S1iPosVfMjnvQU7S+iVW HzUoh04Tvsbk4xSSvOJqIwWlHQ43rBef4U8lysmvrcr2S0iKNRE7d2fRwVxDLeeuVcRb hdgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=wuE00ELC; 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 n1-v6si12202692pld.204.2018.04.16.07.49.41; Mon, 16 Apr 2018 07:49:41 -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=wuE00ELC; 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 S1752940AbeDPOtI (ORCPT + 29 others); Mon, 16 Apr 2018 10:49:08 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:62379 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752821AbeDPOtF (ORCPT ); Mon, 16 Apr 2018 10:49:05 -0400 Received: from grover.sesame (FL1-125-199-20-195.osk.mesh.ad.jp [125.199.20.195]) (authenticated) by conuserg-10.nifty.com with ESMTP id w3GElqtp017749; Mon, 16 Apr 2018 23:47:53 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w3GElqtp017749 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1523890074; bh=F06LX9b18Des9LUgr8HfK4zymALQVUMW+ZLKK7UOatg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wuE00ELCJ4Jq9j2pFOCOyxtIFAEtjz8LQYqBN7fesk5oWkgDk276iZPffCgrtouN/ 0uhgHTtLVC/Hsfg07ijiOD+0SgGpU02YM/h0zO1Dlq7dhlIhH9w2/Qs5Q842u4i8g+ iuOqxvf2Y6jgLdCQnKjpYNynhGlmU4Lj+gByCqbcsvpvDXl7B718Dvx5HOqF6yU91k 17KLUnlY37iBF59LiarRkb6w3jGSx1I5n0Sn5PxRRmgsk6w/5QmvHGGvNR/LmrgSwP sromBbh/6QckuHfIyNCW4AFfIsc89IZI8yJ5Y1g5ryDK6p7O6zN99TqOZWyRpofR6L TyokVcnWCG3AA== X-Nifty-SrcIP: [125.199.20.195] From: Masahiro Yamada To: Ralf Baechle , James Hogan , linux-mips@linux-mips.org Cc: Paul Burton , Masahiro Yamada , Kees Cook , linux-kernel@vger.kernel.org Subject: [PATCH 1/7] Revert "MIPS: boot: Define __ASSEMBLY__ for its.S build" Date: Mon, 16 Apr 2018 23:47:41 +0900 Message-Id: <1523890067-13641-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1523890067-13641-1-git-send-email-yamada.masahiro@socionext.com> References: <1523890067-13641-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 0f9da844d87796ac31b04e81ee95e155e9043132. It is true that commit 0f9da844d877 ("MIPS: boot: Define __ASSEMBLY__ for its.S build") fixed the build error, but it should not have defined __ASSEMBLY__ just for textual substitution in arbitrary data. The file is image tree source in this case, but the purpose of using CPP is to replace some macros. I merged a better solution, commit a95b37e20db9 ("kbuild: get out of "). The original fix-up is no longer needed. Signed-off-by: Masahiro Yamada --- arch/mips/boot/Makefile | 1 - 1 file changed, 1 deletion(-) -- 2.7.4 diff --git a/arch/mips/boot/Makefile b/arch/mips/boot/Makefile index c22da16..1bd5c4f 100644 --- a/arch/mips/boot/Makefile +++ b/arch/mips/boot/Makefile @@ -126,7 +126,6 @@ $(obj)/vmlinux.its.S: $(addprefix $(srctree)/arch/mips/$(PLATFORM)/,$(ITS_INPUTS quiet_cmd_cpp_its_S = ITS $@ cmd_cpp_its_S = $(CPP) $(cpp_flags) -P -C -o $@ $< \ - -D__ASSEMBLY__ \ -DKERNEL_NAME="\"Linux $(KERNELRELEASE)\"" \ -DVMLINUX_BINARY="\"$(3)\"" \ -DVMLINUX_COMPRESSION="\"$(2)\"" \