Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752348AbdLMDm2 (ORCPT ); Tue, 12 Dec 2017 22:42:28 -0500 Received: from mail-pl0-f65.google.com ([209.85.160.65]:46866 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751612AbdLMDmZ (ORCPT ); Tue, 12 Dec 2017 22:42:25 -0500 X-Google-Smtp-Source: ACJfBovg2u2iTIQhds2z1meXVVIbS9qFb2J6pF7C+hiybrBckQRv0aAg5ybBflIrJshLKzU52EgQig== From: Joel Stanley To: Jonas Bonn , Stefan Kristiansson , Stafford Horne Cc: openrisc@lists.librecores.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky , Petr Mladek Subject: [PATCH] openrisc: Fix conflicting types for _exext and _stext Date: Wed, 13 Dec 2017 14:12:12 +1030 Message-Id: <20171213034212.25910-1-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1428 Lines: 42 The printk tree in linux-next has a patch "symbol lookup: introduce dereference_symbol_descriptor()" that includes sections.h in kallsyms.h, so arch/openrisc/kernel/traps.c gets a second extern definition for _etext and _stext. Remove the local definitions and include sections.h directly in preparation for the kallsyms.h change. This fixes the following (future) build error: CC arch/openrisc/kernel/traps.o arch/openrisc/kernel/traps.c:43:13: error: conflicting types for ‘_etext’ extern char _etext, _stext; ^ In file included from ./arch/openrisc/include/generated/asm/sections.h:1:0, from ./include/linux/kallsyms.h:15, from arch/openrisc/kernel/traps.c:35: ./include/asm-generic/sections.h:35:32: note: previous declaration of ‘_etext’ was here extern char _text[], _stext[], _etext[]; ^ Signed-off-by: Joel Stanley --- arch/openrisc/kernel/traps.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/openrisc/kernel/traps.c b/arch/openrisc/kernel/traps.c index 4085d72fa5ae..5fb6d512502d 100644 --- a/arch/openrisc/kernel/traps.c +++ b/arch/openrisc/kernel/traps.c @@ -39,8 +39,7 @@ #include #include #include - -extern char _etext, _stext; +#include int kstack_depth_to_print = 0x180; int lwa_flag; -- 2.14.1