From patchwork Wed Dec 13 03:42:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 121722 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4963844qgn; Tue, 12 Dec 2017 19:42:34 -0800 (PST) X-Google-Smtp-Source: ACJfBot+0+krxgkxSGtwcBV8ek+U4VQ4oUtivkaJHmv8H8WVzNsYuvWXvowsMGoRPZKgExS9k/Ea X-Received: by 10.99.106.67 with SMTP id f64mr4123393pgc.453.1513136554283; Tue, 12 Dec 2017 19:42:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513136554; cv=none; d=google.com; s=arc-20160816; b=pD00D6I4Cp3k4C+eI/rU9cYL5n8g3TXBhL/kJvsJdFcjv+lBYK063q4M2RpgtZbi7n BShzropFGp90fzT3uUQivEcupzv3d671p23RdVdiBqbt79IzxAM7jj9kp7Ekb7UneX1D 2whUo3W9pdVF3W3enfSDTdvL4nTXpxdy/lzpY1FlJRcvmnFToEbdyT5WJgA0wOVfCJ9n 67RPdLkMJqbroJiAeZo5OC1WtPQKOLMGF1Mz1sqtgGy9n2X3hMn2u1vKcAag/TjZCig7 FvmV0MRo0h5uv8VkoEB8aO9m5+ZQetqhMQRuxGO+PJmEJM1MOoh3W0CHLa/xHaMalfQU Xrrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=Y+CldOJZmqYgpu1moipvtwuCiDyWt4OC02J3BNFl5LU=; b=FmH1vPjeW5vBuaNHt58HZy3YuuBZfnXofeFtyf+CR/nyf7NCMow3NVDi965+uW7ZTC 8EtEj/LF4Gqd1iky7QzegW9gjfDtbBiFQtcn3s+wpnZ/8Lg5zmUcRCQQxXFbsMd16e40 3cmSwW/o9B7SaLHTHarVWKSNjC/qJukXl43CI0aQL384U/0nlC0TSIbyuibqkpP3OKFJ 0CABRDL7wRmINmMA45rLkcUOCmtjIBOfjJvABO9g+YjDclLsFKqVib7yYl8vIcgu8FYP 6kfzpbO+YCsNsE666Pz2A/3GyNwoANZuqf+1HcgBiRYE5r46ASm0G3E/tA1NiT7c2yJ5 1Msg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=XNOzwRvp; 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 g1si560261pld.816.2017.12.12.19.42.34; Tue, 12 Dec 2017 19:42:34 -0800 (PST) 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=fail header.i=@gmail.com header.s=20161025 header.b=XNOzwRvp; 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 S1752348AbdLMDm2 (ORCPT + 10 others); 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 Received: by mail-pl0-f65.google.com with SMTP id i6so246801plt.13 for ; Tue, 12 Dec 2017 19:42:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Y+CldOJZmqYgpu1moipvtwuCiDyWt4OC02J3BNFl5LU=; b=XNOzwRvphBIKuQdJCOeUDkj/AktRz8EoiyU+WNbzDxEs+WbzZ8poKRHPWGyrW+IY1h H6t9igg/05Uq+ADccdEF1t7gFa4R4C5KhmiZ3v0B5k0XsupGbnkdxjIWRZVOeU2oto/I i/tcCuQzAuU/VIGbg2j1JzDDkpgE2D1EojfMxf5L/xPYt+v/tqmUtRtT2FDcPXvMYJty 5EzDZwhTmX9ZmvNXromwhd7zhxk6o1s742coYBPBebZkzNG9Mn8Ff8vM8lBO+Gkhtejo 2fQOlQc8OpntWIy9bn48033frFa5Xtp/5Arj+GCHAmkuO0Cyg0WLq7F4CziWAKUYbDD3 v9/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=Y+CldOJZmqYgpu1moipvtwuCiDyWt4OC02J3BNFl5LU=; b=ovJ+nt6rDxPFJGLPw0jj/OBFdfkpktHiXPVJE9Oq8eEtbRuyJObihrCrNQ/GhORpyd l1v9Nt8KotkH8jiAsLil9cUovrNwCkyXHYoaQ4WJ1ZQCqopLmp4W5A+qBUaVgGT8OmKt EINb8D6d6d9PsJlHYj3428rvGeLiV8lDFmo5acMZ10SwiUZS4tXC7j7TvF6V1Tle/HJY VkL8S+Apl2RnD1abTDuDjY9/hRTADfqC82dk5vlc8CHG9fH6lggFx+bcTZit0teUSiCE qXgXisy7S0FQgNoE78HgO/sjwFV6vsXrZ0pYDGloNlFgKlIdNb5B/LUY5zjcfWmQjPqE fSng== X-Gm-Message-State: AKGB3mLDvmuKK3Yq2Z+m46P6RJbtpko4UsxtuIKlYSQl/GX/53+pbFYN tcxQSkZaQ4OuxUFbjArjMMA= X-Received: by 10.84.129.47 with SMTP id 44mr4464673plb.442.1513136544296; Tue, 12 Dec 2017 19:42:24 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id m25sm811366pfk.37.2017.12.12.19.42.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Dec 2017 19:42:23 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Wed, 13 Dec 2017 14:12:15 +1030 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 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.14.1 Reviewed-by: Sergey Senozhatsky 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;