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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 0BF09C3276E for ; Thu, 2 Jan 2020 22:11:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CB73621D7D for ; Thu, 2 Jan 2020 22:11:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578003075; bh=g0rgOA3HoY9PhWlM0zSqCVb2bgoYbxFetloP04hzmgw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=w8+jiXSozEk8vsTmHsJWRUY9uSdYdGNyt0XwMREA+K2H3NMc87lWLlD4SvqtdsIVN vSekqaDqR49z5e4Ki/IoFZ5CqzJb1nJreWQS3+affHAYn8i3IMNNCXlwmfxBvy7tg2 xFIJCOVnDyTLLKV+M6Xzz297QTknBuZy1RF65zRg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726052AbgABWLP (ORCPT ); Thu, 2 Jan 2020 17:11:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:49100 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725872AbgABWLO (ORCPT ); Thu, 2 Jan 2020 17:11:14 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 6B6A021582; Thu, 2 Jan 2020 22:11:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578003073; bh=g0rgOA3HoY9PhWlM0zSqCVb2bgoYbxFetloP04hzmgw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EVltsG54/iWOV/H/4M7tqaTXsNZFlt4U0R4gtjGZy4Za1rOuhJ2+cCg4/23xrpkmV 8Uzg3bFSA8yNfxLnuFZgdzDYF2oqCmatrLuS5UBn/N3WwV4F6G4RwzR34BAECyE1/Z 9wVM3i2fliyN+UUYytsP2QbDkLYti4sq01iMKQHc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Guenter Roeck , Paul Burton , Sasha Levin Subject: [PATCH 5.4 001/191] Revert "MIPS: futex: Restore \n after sync instructions" Date: Thu, 2 Jan 2020 23:04:43 +0100 Message-Id: <20200102215830.043513213@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200102215829.911231638@linuxfoundation.org> References: <20200102215829.911231638@linuxfoundation.org> User-Agent: quilt/0.66 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Greg Kroah-Hartman This reverts commit dc9d0a75ce9af74612d6a4d052e4df2bddfe8ed4 which is commit fd7710cb491f900eb63d2ce5aac0e682003e84e9 upstream. This, and the follow-on patch, breaks the mips build so it needs to be reverted. Reported-by: Guenter Roeck Cc: Paul Burton Cc: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- arch/mips/include/asm/futex.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/arch/mips/include/asm/futex.h +++ b/arch/mips/include/asm/futex.h @@ -33,7 +33,7 @@ " .set arch=r4000 \n" \ "2: sc $1, %2 \n" \ " beqzl $1, 1b \n" \ - __stringify(__WEAK_LLSC_MB) " \n" \ + __stringify(__WEAK_LLSC_MB) \ "3: \n" \ " .insn \n" \ " .set pop \n" \ @@ -63,7 +63,7 @@ " .set "MIPS_ISA_ARCH_LEVEL" \n" \ "2: "user_sc("$1", "%2")" \n" \ " beqz $1, 1b \n" \ - __stringify(__WEAK_LLSC_MB) " \n" \ + __stringify(__WEAK_LLSC_MB) \ "3: \n" \ " .insn \n" \ " .set pop \n" \ @@ -148,7 +148,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, " .set arch=r4000 \n" "2: sc $1, %2 \n" " beqzl $1, 1b \n" - __stringify(__WEAK_LLSC_MB) " \n" + __stringify(__WEAK_LLSC_MB) "3: \n" " .insn \n" " .set pop \n"