From patchwork Wed Jun 15 15:45:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9178873 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A8532604DB for ; Wed, 15 Jun 2016 15:48:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9744727DCE for ; Wed, 15 Jun 2016 15:48:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8973327F17; Wed, 15 Jun 2016 15:48:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3314527DCE for ; Wed, 15 Jun 2016 15:48:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933367AbcFOPqJ (ORCPT ); Wed, 15 Jun 2016 11:46:09 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:52455 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753119AbcFOPpM (ORCPT ); Wed, 15 Jun 2016 11:45:12 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue102) with ESMTPA (Nemesis) id 0LoHFZ-1bsrGJ1IxF-00gExZ; Wed, 15 Jun 2016 17:44:30 +0200 From: Arnd Bergmann To: Michal Marek Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Arnd Bergmann Subject: [PATCH v2 07/11] ARM: hide mach-*/ include for ARM_SINGLE_ARMV7M Date: Wed, 15 Jun 2016 17:45:49 +0200 Message-Id: <20160615154553.3177021-8-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160615154553.3177021-1-arnd@arndb.de> References: <20160615154553.3177021-1-arnd@arndb.de> X-Provags-ID: V03:K0:OFT6Z/8VNCqrFQ4+WazcOXMXloQj+ngYWIk3ofzc8D0GeKbUCNK SiLn0igDaq5Ibazl5HTKMKt5JVTiTSxSPjTyhTP+ci/BEeoHIrwThnAWsaHDkVyR1VI24fq ZFEwPOYsKEun3HcgBPrKgCZUJHZ8UGBxd2HmwLFUvyJ+eT5n0xRpq9ytD7oib4ocGjBxw4L mw4IJRdp8wUIZZ2Pf+4wg== X-UI-Out-Filterresults: notjunk:1; V01:K0:xbQNv/DSguU=:drzpibdz5A6UogspQNKWwj 5nvxgxPsS7FCoLcFCq4KFRtvA2borjeESBVkyWeqbDM+/dskYeI4MQbG4s2TRnBPhfIObe8dT LIy6LokJ6/UkIlZ5hIYR95WxblKSAGaznYTvUdOc+wLkXYmR4J+9DjOv6mrliBVEIBTKC+PCu SeJdCYnGjiZFYHkRnwkCvOKIxMh2oN+sq8XgdxNYNwciihmwlVE72PPnqRSp2YXM3mm+UjvkG MZIS1kaLAli/py52tCgBbi1Mtcazne+dNPq/Ba4ERaekpIhZ3bnhpiFEKM0tZgj8OcSQ0B+kM wLNxDkZA1XEUO4fvOUPX5WcZ5yHdudz4j8uAEXggzhTwQi1XaAiVonv2/FSMCvRMkOm/J6ZTQ vn2P+24XuuR2PkHwH681nKa0R6cJWUKYFoQ4Hit0qlDAKjjhoI5u4Mkv1PMNttnPGe4mz50o9 Q344GmMhWWcHfHnXn/rcFqM2EADEd+5AXqwHsf52pS7hRv9bo1oGm5H3NVQ4H5BWZJkCV/wUK iQ0lbu9v+iKADiIEKRGdSVdbIg6kfQENiSCAhIYLfU1c7r6K8zGeMDyX7wsPDSQCFd3XZV9t8 AgzeokQPCc51bPM8SarkOkatNSSrMV5xvVHapfBiHahGedIAhuXhyP4XGA6+WPXVSVx42rlF4 bqOQ6BlS+u1Nl1Rrag4c4EE6SXuhV0DxyPk1t3g7fnwf483rwu6nmCL/Td4JE7W4a2+k= Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The machine specific header files are exported for traditional platforms, but not for the ones that use ARCH_MULTIPLATFORM, as they could conflict with one another. In case of ARM_SINGLE_ARMV7M, we end up also exporting them, but that appears to be a mistake, and we should treat it the same way as ARCH_MULTIPLATFORM here. 'make W=1' warns about this because it passes -Wmissing-includes to gcc and the directories are not actually present. Signed-off-by: Arnd Bergmann --- arch/arm/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 510620186ee8..3982c7e2fe55 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -266,12 +266,14 @@ machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y)) platdirs := $(patsubst %,arch/arm/plat-%/,$(sort $(plat-y))) ifneq ($(CONFIG_ARCH_MULTIPLATFORM),y) +ifneq ($(CONFIG_ARM_SINGLE_ARMV7M),y) ifeq ($(KBUILD_SRC),) KBUILD_CPPFLAGS += $(patsubst %,-I%include,$(machdirs) $(platdirs)) else KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs) $(platdirs)) endif endif +endif export TEXT_OFFSET GZFLAGS MMUEXT