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=-3.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS 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 E7B17C43381 for ; Thu, 7 Mar 2019 11:53:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B7D0520661 for ; Thu, 7 Mar 2019 11:53:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="ygg06C7j" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726741AbfCGLxn (ORCPT ); Thu, 7 Mar 2019 06:53:43 -0500 Received: from merlin.infradead.org ([205.233.59.134]:51024 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726598AbfCGLw7 (ORCPT ); Thu, 7 Mar 2019 06:52:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Type:MIME-Version:References: Subject:Cc:To:From:Date:Message-Id:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=ju5JSKNi4NGbGh3ifMvKfeDKXhByoHuema1Et/OQCtk=; b=ygg06C7j+SNYjoe6OPM0s+r7bc 6QuJf5ZqTWz5TTqzDQChuA28T1MmlglmkceCP6Dh3B23SqJxs5Jf0rEs4ENJuP0ZhZb7ua+w+4ANV 1Y699fyha0t0+sPlPfM22HlF2DvSW4udcRx8GHMp3WDitlzdNnwmqTAQe0PSowCCFlhw6mul8RBDv Sa6++PsedsO3d0AuTUogQIi4oiBlRUNmT8rLVgpkugUoqccrXlHXFevZuWwO6XR3Q+SER3wlq0OfM caKV1+mnrCHKCLU/DfzkcWCR+z7mYdjIYEAko5RozQik7FxfcGVRvL2bKok8w7b95aJMDqTHybikN 8K3AncKA==; Received: from j217100.upc-j.chello.nl ([24.132.217.100] helo=hirez.programming.kicks-ass.net) by merlin.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1h1rZm-0005PW-N5; Thu, 07 Mar 2019 11:52:39 +0000 Received: by hirez.programming.kicks-ass.net (Postfix, from userid 0) id BC4C720297BDF; Thu, 7 Mar 2019 12:52:35 +0100 (CET) Message-Id: <20190307115200.149650756@infradead.org> User-Agent: quilt/0.65 Date: Thu, 07 Mar 2019 12:45:23 +0100 From: Peter Zijlstra To: torvalds@linux-foundation.org, tglx@linutronix.de, hpa@zytor.com, julien.thierry@arm.com, will.deacon@arm.com, luto@amacapital.net, mingo@kernel.org, catalin.marinas@arm.com, james.morse@arm.com, valentin.schneider@arm.com, brgerst@gmail.com, jpoimboe@redhat.com, luto@kernel.org, bp@alien8.de, dvlasenk@redhat.com Cc: linux-kernel@vger.kernel.org, peterz@infradead.org, dvyukov@google.com, rostedt@goodmis.org Subject: [PATCH 12/20] objtool: Set insn->func for alternatives References: <20190307114511.870090179@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Make sure we set the function association for alternative instruction sequences; they are after all still part of the function. Signed-off-by: Peter Zijlstra (Intel) --- tools/objtool/check.c | 1 + 1 file changed, 1 insertion(+) --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -695,6 +695,7 @@ static int handle_group_alt(struct objto last_new_insn = insn; insn->ignore = orig_insn->ignore_alts; + insn->func = orig_insn->func; if (insn->type != INSN_JUMP_CONDITIONAL && insn->type != INSN_JUMP_UNCONDITIONAL)