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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 7415AC0650F for ; Thu, 8 Aug 2019 19:53:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3BE1621911 for ; Thu, 8 Aug 2019 19:53:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565294011; bh=uzqc82uL7ogPgfU3mLq02OpcxdL1zrJ3Wa79m/7CGeM=; h=From:To:Subject:Date:In-Reply-To:References:In-Reply-To: References:List-ID:From; b=OevJvD2xLBBpjed+IP8mmEGf6VzkWxV38jtcYtMG1H3AVSTNPtbO/EQQZK5rFy4oy q4p/IRBvWHM7XB78VjIc2SkZPzo8ktdzMrdq0tqXyfQo57UOKIZ2qi5/OxPMnTJ5KA VJ/9JuF2ZqtbJRKKB0boZ6MG88eHf2QQzBwrQcOA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404263AbfHHTxa (ORCPT ); Thu, 8 Aug 2019 15:53:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:58100 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404493AbfHHTxV (ORCPT ); Thu, 8 Aug 2019 15:53:21 -0400 Received: from localhost.localdomain (c-98-220-238-81.hsd1.il.comcast.net [98.220.238.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4071D218BA; Thu, 8 Aug 2019 19:53:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565294001; bh=uzqc82uL7ogPgfU3mLq02OpcxdL1zrJ3Wa79m/7CGeM=; h=From:To:Subject:Date:In-Reply-To:References:In-Reply-To: References:From; b=bU4bv4chKeLbwypjLEWS5KvWXiBncOS7Dn7FvnirNJUp8mXqoxpKoHGvp1MK/sM4r vevO0TAAFPf2b+d7XWAJT3PtGAVjoDl4ym+7f7BXmWNYiQHd4fzBFRagIFp0rd76Aq lDxAfy2yDe4OsuvhtGP+MsdMmbiJfMQfTh4aDHbI= From: zanussi@kernel.org To: LKML , linux-rt-users , Steven Rostedt , Thomas Gleixner , Carsten Emde , John Kacur , Sebastian Andrzej Siewior , Daniel Wagner , Tom Zanussi , Julia Cartwright Subject: [PATCH RT 12/19] Revert "futex: Ensure lock/unlock symetry versus pi_lock and hash bucket lock" Date: Thu, 8 Aug 2019 14:52:40 -0500 Message-Id: <0b6569b5ad6a4b31289a9f62f40f86a67a151115.1565293934.git.zanussi@kernel.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sebastian Andrzej Siewior v4.14.137-rt65-rc1 stable review patch. If anyone has any objections, please let me know. ----------- [ Upstream commit 6a773b70cf105b46298ed3b44e77c102ce31d9ec ] Drop the RT fixup, the futex code will be changed to avoid the need for the workaround. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Tom Zanussi --- kernel/futex.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/kernel/futex.c b/kernel/futex.c index ad0abb0e339f..07b148ad703a 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -936,9 +936,7 @@ void exit_pi_state_list(struct task_struct *curr) if (head->next != next) { /* retain curr->pi_lock for the loop invariant */ raw_spin_unlock(&pi_state->pi_mutex.wait_lock); - raw_spin_unlock_irq(&curr->pi_lock); spin_unlock(&hb->lock); - raw_spin_lock_irq(&curr->pi_lock); put_pi_state(pi_state); continue; } -- 2.14.1