From patchwork Fri Jul 9 13:21:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 472269 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=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, 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 AF9ABC07E99 for ; Fri, 9 Jul 2021 13:22:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9F0CD613CC for ; Fri, 9 Jul 2021 13:22:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232771AbhGINZK (ORCPT ); Fri, 9 Jul 2021 09:25:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:56818 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232782AbhGINZH (ORCPT ); Fri, 9 Jul 2021 09:25:07 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 727CE613C9; Fri, 9 Jul 2021 13:22:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1625836943; bh=PzpvqfU6f5oLWuoHECyjw67HkBbYMx6fOd7uBxrq38g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OC/0kkiNHzAB6a9vc4HezGR7wKmZsnEGwlb4kInZYrtxDvNu5NJpKrP+JA249QVlp PghFWgu43cSZfHz9lxYyHxAKBkx8fT5Q2VsCosyIXBazgkg9wCLIf4Ci0AVoi+0f9U ZHoTINnHFZUqwqilIoTKcm/C4u2BaICfH3F+MH1M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sid Manning , Brian Cain , Nick Desaulniers , Guenter Roeck Subject: [PATCH 5.10 5/6] Hexagon: change jumps to must-extend in futex_atomic_* Date: Fri, 9 Jul 2021 15:21:14 +0200 Message-Id: <20210709131543.604675641@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210709131537.035851348@linuxfoundation.org> References: <20210709131537.035851348@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sid Manning commit 6fff7410f6befe5744d54f0418d65a6322998c09 upstream. Cross-section jumps from .fixup section must be extended. Signed-off-by: Sid Manning Signed-off-by: Brian Cain Tested-by: Nick Desaulniers Reviewed-by: Nick Desaulniers Cc: Guenter Roeck Signed-off-by: Greg Kroah-Hartman --- arch/hexagon/include/asm/futex.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/arch/hexagon/include/asm/futex.h +++ b/arch/hexagon/include/asm/futex.h @@ -21,7 +21,7 @@ "3:\n" \ ".section .fixup,\"ax\"\n" \ "4: %1 = #%5;\n" \ - " jump 3b\n" \ + " jump ##3b\n" \ ".previous\n" \ ".section __ex_table,\"a\"\n" \ ".long 1b,4b,2b,4b\n" \ @@ -90,7 +90,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, "3:\n" ".section .fixup,\"ax\"\n" "4: %0 = #%6\n" - " jump 3b\n" + " jump ##3b\n" ".previous\n" ".section __ex_table,\"a\"\n" ".long 1b,4b,2b,4b\n"