From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A8392C43613 for ; Mon, 24 Jun 2019 10:09:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7E0152089F for ; Mon, 24 Jun 2019 10:09:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561370940; bh=6Tczy/LPCmXuXBRIHyLsjCWyZj76TRsf8UNl8F5pyAc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=l5Z/nx6AjX6MTcQeGYxeO0C2vAzIJJqdkI8LIXv8GoZZwet+wgTTgiH3p0GyR2ApS TbWHoEi/zRnxfjLxWGUu7BF++hIcepjtI0gaLPWL9/4mzNOZ+5XY6zo2eriIpc8cXy 81pPH2h2u4d+V8bVxx2PQ9SBhVqecnA58eo+m3CE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729787AbfFXKI6 (ORCPT ); Mon, 24 Jun 2019 06:08:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:42920 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729679AbfFXKI6 (ORCPT ); Mon, 24 Jun 2019 06:08:58 -0400 Received: from localhost (f4.8f.5177.ip4.static.sl-reverse.com [119.81.143.244]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0C7C620645; Mon, 24 Jun 2019 10:08:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561370937; bh=6Tczy/LPCmXuXBRIHyLsjCWyZj76TRsf8UNl8F5pyAc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fjn/Ocw4mD6DCUas0yl5gOPCzq3mdxMn7qCz1JGuOHZ3894kj4UNLUIK2H9LC5Xrv nbUKU8/XljYFUApyJqIERkh6qnVpws5TxiUsy+LWsYySU825IjQfipf+FkJGGnzWHK hYW9bM9hn4A8zC0bdR5eMfL34CEuELilIA90azIo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Guenter Roeck , Max Filippov , Sasha Levin Subject: [PATCH 5.1 056/121] xtensa: Fix section mismatch between memblock_reserve and mem_reserve Date: Mon, 24 Jun 2019 17:56:28 +0800 Message-Id: <20190624092323.566660181@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190624092320.652599624@linuxfoundation.org> References: <20190624092320.652599624@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit adefd051a6707a6ca0ebad278d3c1c05c960fc3b ] Since commit 9012d011660ea5cf2 ("compiler: allow all arches to enable CONFIG_OPTIMIZE_INLINING"), xtensa:tinyconfig fails to build with section mismatch errors. WARNING: vmlinux.o(.text.unlikely+0x68): Section mismatch in reference from the function ___pa() to the function .meminit.text:memblock_reserve() WARNING: vmlinux.o(.text.unlikely+0x74): Section mismatch in reference from the function mem_reserve() to the function .meminit.text:memblock_reserve() FATAL: modpost: Section mismatches detected. This was not seen prior to the above mentioned commit because mem_reserve() was always inlined. Mark mem_reserve(() as __init_memblock to have it reside in the same section as memblock_reserve(). Signed-off-by: Guenter Roeck Message-Id: <1559220098-9955-1-git-send-email-linux@roeck-us.net> Signed-off-by: Max Filippov Signed-off-by: Sasha Levin --- arch/xtensa/kernel/setup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c index 4ec6fbb696bf..a5139f1d9220 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c @@ -310,7 +310,8 @@ extern char _SecondaryResetVector_text_start; extern char _SecondaryResetVector_text_end; #endif -static inline int mem_reserve(unsigned long start, unsigned long end) +static inline int __init_memblock mem_reserve(unsigned long start, + unsigned long end) { return memblock_reserve(start, end - start); } -- 2.20.1