From patchwork Thu Dec 12 20:39:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Levand X-Patchwork-Id: 3334141 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C0CB1C0D4A for ; Thu, 12 Dec 2013 20:42:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 50CF4207C5 for ; Thu, 12 Dec 2013 20:42:07 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 18969207C3 for ; Thu, 12 Dec 2013 20:42:06 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VrD3p-0006Do-VQ; Thu, 12 Dec 2013 20:40:42 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VrD3T-00013D-UW; Thu, 12 Dec 2013 20:40:19 +0000 Received: from geoff by merlin.infradead.org with local (Exim 4.80.1 #2 (Red Hat Linux)) id 1VrD2w-00010M-1i; Thu, 12 Dec 2013 20:39:46 +0000 Message-Id: <735546830af2105db3cbaccc0099a269a842de4e.1386879684.git.geoff@infradead.org> In-Reply-To: References: From: Geoff Levand Patch-Date: Fri, 6 Sep 2013 15:06:51 -0700 Subject: [PATCH 3/5] arm64: Fix include header order in vmlinux.lds.S To: Catalin Marinas , Will Deacon Date: Thu, 12 Dec 2013 20:39:46 +0000 Cc: linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP asm-generic/vmlinux.lds.h should be included after the arch specific headers so that the arch headers can override the generic macro defs in asm-generic/vmlinux.lds.h. Fixes preprosessor redefined warnings when adding arch specific macros. Signed-off-by: Geoff Levand for Huawei, Linaro --- arch/arm64/kernel/vmlinux.lds.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S index 3072c41..6563b64 100644 --- a/arch/arm64/kernel/vmlinux.lds.S +++ b/arch/arm64/kernel/vmlinux.lds.S @@ -4,10 +4,10 @@ * Written by Martin Mares */ -#include #include #include #include +#include #define ARM_EXIT_KEEP(x) #define ARM_EXIT_DISCARD(x) x