From patchwork Tue Jun 6 07:15:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 103126 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp1282795qgd; Tue, 6 Jun 2017 00:16:43 -0700 (PDT) X-Received: by 10.84.228.201 with SMTP id y9mr19841900pli.300.1496733403395; Tue, 06 Jun 2017 00:16:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496733403; cv=none; d=google.com; s=arc-20160816; b=JanaChztkQ7e29v2ekxw2dO8HHmEx8APyb2Jb+5Hq6aB4jS+pIC+3uoAXtOW1WTJva 9jACJJ8yzZdQxhrG4mH0Q7/wRxRlK2l8M7gGU+ZQ9zwuK2fXyrUcozcunzUSIN9abaln 4qVRurht9SvxwpMaS/HuibaoWFQ4TJU+o0OSikuuip9cTrlerqSkCeUQy9YKl1npKgot OqFevmS5fT0SJsCeEOzlbpSotwJD01Ersas6gR6BM1v5kmQkRRsknBBGZsHQYAokskNc wTs6OQcACvLpel8kg+9oz+hTnhAtSOx0kQkSzgIkLfno7kuVzbk268t2srXjhfSuZ9Ud RjJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter:arc-authentication-results; bh=qwWKDAL/RJJTjYfjmWHO0j+iEbCmgt1BOPNDQmQ2HHQ=; b=rl6GQno6Z7Xc7COn5vWl+aDq9tMg/uNUM073ZKdYwoa6lIL7rgyV+5WucYtDiGTmKb PjoM1Ciiq29o5UI5Ooy4kE+5p66nBUBlNqXllA3iwmyyYtfqD86d000tcMPtHlhPKDYO Z4lGPsl1I7yPkZB7vwACg23O3GWeMLzmEgz6i1kaL/5zQENTbK33NBfMdg6VClWCSzcL mDOvJCnMBPkfAnxdXqhSSOBW4e846FufoaxNzxSM1v4PFOSBREPs3QkCY15JhI7pfWnz sTIWdRpGyFYZjmc+MLKjafjV15JON7+8w52hn9Y04nwvuyHXYXmtZxjBRDogP+tL+rLU X5rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com; 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 e6si32424208pgf.386.2017.06.06.00.16.42; Tue, 06 Jun 2017 00:16:43 -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; 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 S1751377AbdFFHQY (ORCPT + 25 others); Tue, 6 Jun 2017 03:16:24 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:47908 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751277AbdFFHQW (ORCPT ); Tue, 6 Jun 2017 03:16:22 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-07.nifty.com with ESMTP id v567FYrp008632; Tue, 6 Jun 2017 16:15:34 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com v567FYrp008632 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1496733335; bh=qwWKDAL/RJJTjYfjmWHO0j+iEbCmgt1BOPNDQmQ2HHQ=; h=From:To:Cc:Subject:Date:From; b=znOkVCMN6NtFgS9JdO5/74GOiQyB5NlKvya0Uf3sB2jWj7DAkmuu6i2E+qN76lcVy 22ICstV4t29G5aLCVOPAzFt3IjqHCHqqSmQ1uZeCzLbjADusJijM2N1KIjvWRhyWM1 4mlAE5ieT2+Zj0D5fEvhx5vLyIUQKxsF+TH2H7UW8w+HfNqGSFWYEh6U/uh0tRL9/H SKYFJOU9SfPOx2lHCXGZ15Gmoth0RNs1jWwx+TkYMaLrojHzX65JvtCyXIf51zPd5A ZdX9Bqoc77ulQeTwHr5K+4CITEbbtDF+Ousy/XuryW8+Thkh+EOSJ20L3U3+Ci4OmG RpuePZKESvmVw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Michal Marek , Arnd Bergmann , James Hogan , Florian Fainelli , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH] kbuild: remove duplicated arch/*/include/generated/uapi include path Date: Tue, 6 Jun 2017 16:15:28 +0900 Message-Id: <1496733328-22521-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 90ac086bca10 ("Makefile: include arch/*/include/generated/uapi before .../generated") introduced this for bisect'ability. The commit chose to promote arch/*/include/generated/uapi in the search path rather than cleaning stale headers. After all, we found that approach was not enough, and ended up with cleaning stale headers by commit cda2c65f981d ("kbuild: Remove stale asm-generic wrappers"). So, the extra search path is no longer needed because Kbuild invokes scripts/Makefile.asm-generic and remove stale headers before it starts descending. This commit is also reverting commit dc33db7c338e ("Kbuild: avoid duplicate include path") because we have no more duplicated path. Signed-off-by: Masahiro Yamada --- Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- 2.7.4 diff --git a/Makefile b/Makefile index 813ee12431b6..c2c212264752 100644 --- a/Makefile +++ b/Makefile @@ -387,12 +387,10 @@ USERINCLUDE := \ # Needed to be compatible with the O= option LINUXINCLUDE := \ -I$(srctree)/arch/$(hdr-arch)/include \ - -I$(objtree)/arch/$(hdr-arch)/include/generated/uapi \ -I$(objtree)/arch/$(hdr-arch)/include/generated \ $(if $(KBUILD_SRC), -I$(srctree)/include) \ - -I$(objtree)/include - -LINUXINCLUDE += $(filter-out $(LINUXINCLUDE),$(USERINCLUDE)) + -I$(objtree)/include \ + $(USERINCLUDE) KBUILD_CPPFLAGS := -D__KERNEL__