From patchwork Wed Apr 15 09:48:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 6219471 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D4E98BF4A6 for ; Wed, 15 Apr 2015 09:49:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CEF982034F for ; Wed, 15 Apr 2015 09:49:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B9665202E9 for ; Wed, 15 Apr 2015 09:49:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751400AbbDOJtQ (ORCPT ); Wed, 15 Apr 2015 05:49:16 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:62150 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751200AbbDOJtP (ORCPT ); Wed, 15 Apr 2015 05:49:15 -0400 Received: from wuerfel.localnet ([149.172.15.242]) by mrelayeu.kundenserver.de (mreue002) with ESMTPSA (Nemesis) id 0MJJxi-1YfZqZ1LNi-002rx1; Wed, 15 Apr 2015 11:48:37 +0200 From: Arnd Bergmann To: Rusty Russell Cc: Quentin Casasnovas , linux-kbuild@vger.kernel.org, Ard Biesheuvel , Nicolas Pitre , Russell King , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] modpost: add .text.fixup to OTHER_TEXT_SECTIONS Date: Wed, 15 Apr 2015 11:48:31 +0200 Message-ID: <5641468.B6ky8Ch4vY@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:Wul0fX/yiIlLztHxCN0Tl7wrGN6nHUx+jNRrtegLMmzEbY57fjY 4yIbzGtBhltB4L62/PiqvyI7jGw32XaBlfu5QRhRCvyj+Zbrow+nkHG2Az3NRGjLAwYpBfB eZEKXD2ofKkkoxc6gUIiQYEKdRzng5FDD0IToPF5i7S92dKVNZjZN+zs8T8is1QNmaVBehy vjq9wr2uT9nrjpyrBXiyw== X-UI-Out-Filterresults: notjunk:1; Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Two correct patches for the 4.1 release clashed in a way that caused modpost to fail badly, with hundreds warnings like WARNING: vmlinux.o(__ex_table+0x1014): Section mismatch in reference from the (unknown reference) (unknown) to the (unknown reference) .text.fixup:(unknown) The fix, as suggested by the warnings, is to add the new .text.fixup section into the OTHER_TEXT_SECTIONS list. Signed-off-by: Arnd Bergmann Fixes: 52dc0595d540 ("modpost: handle relocations mismatch in __ex_table") Fixes: c4a84ae39b4a ("ARM: 8322/1: keep .text and .fixup regions closer together") --- The mostpost patch has not made it into 4.1 yet, so it's probably best to add this fix on top of that to avoid breaking when Linus pulls it in. -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index cbd53e08769d..dd7efba020a1 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -876,7 +876,7 @@ static void check_section(const char *modname, struct elf_info *elf, #define TEXT_SECTIONS ".text", ".text.unlikely", ".sched.text", \ ".kprobes.text" #define OTHER_TEXT_SECTIONS ".ref.text", ".head.text", ".spinlock.text", \ - ".fixup", ".entry.text" + ".fixup", ".text.fixup", ".entry.text" #define INIT_SECTIONS ".init.*" #define MEM_INIT_SECTIONS ".meminit.*"