From patchwork Thu Mar 17 15:39:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Zanussi X-Patchwork-Id: 552975 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1CA84C433FE for ; Thu, 17 Mar 2022 15:39:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235832AbiCQPkj (ORCPT ); Thu, 17 Mar 2022 11:40:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235285AbiCQPki (ORCPT ); Thu, 17 Mar 2022 11:40:38 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 50D5320C2E0; Thu, 17 Mar 2022 08:39:22 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E18706199B; Thu, 17 Mar 2022 15:39:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7B72AC340EF; Thu, 17 Mar 2022 15:39:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647531561; bh=No/nArYdGiPaiSflbYi9n3JC3ItYkbFrFm5VnVe0g94=; h=From:To:Subject:Date:In-Reply-To:References:In-Reply-To: References:From; b=JsELj5TFdiNOmnNPOTxgdEbPy9oaD0+AIBoev2UJsob2PK2KYI8F1WZsWUMB8di6h FQJPMDikz+1nERbi/4wXfwarVcVikb0IiWwvzYC98oniIJkoNTyy6lMi7JCf1/iyDh EbXFx7DlbwsT2/rZ8ybgFXrTGtV3PgML5cbmpifynsOhvgkuO+wnCpMwgvVQCu3lbQ 6I0xUYIHVnZ/Vm5K0+WhThCM2O6wP9Oi2DXsO2q5w2B87yYvi+zv6TXJj1wwVjiTCa JzURqYctGygrSDjAj+aNy9FLEn1oWsLxR9eIDAWN9qyqF3xNHqVTNDJ8n/2GgA6msF GMxjEC2MEL//Q== From: zanussi@kernel.org To: LKML , linux-rt-users , Steven Rostedt , Thomas Gleixner , Carsten Emde , John Kacur , Sebastian Andrzej Siewior , Daniel Wagner , Clark Williams , "Luis Claudio R. Goncalves" , Tom Zanussi Subject: [PATCH RT 1/2] eventfd: Fix stable-rt v5.4.182-rt71 conflict fixup issue Date: Thu, 17 Mar 2022 10:39:16 -0500 Message-Id: <7ecbf796f7026cf007e9d03d251a9f04e89cd3e9.1647531549.git.zanussi@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Precedence: bulk List-ID: X-Mailing-List: linux-rt-users@vger.kernel.org From: Tom Zanussi v5.4.182-rt72-rc1 stable review patch. If anyone has any objections, please let me know. ----------- This fixes an issue in stable-rt release v5.4.182-rt71 where a hunk from the context diff was inadvertently included in a conflict fixup where it shouldn't have been. Remove those lines that don't belong. Reported-by: Sebastian Andrzej Siewior Signed-off-by: Tom Zanussi --- include/linux/sched.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index e1dfb01f4623..91f1aac3c86a 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -802,14 +802,6 @@ struct task_struct { /* to be used once the psi infrastructure lands upstream. */ unsigned use_memdelay:1; #endif -#ifdef CONFIG_PSI - /* Stalled due to lack of memory */ - unsigned in_memstall:1; -#endif -#ifdef CONFIG_PAGE_OWNER - /* Used by page_owner=on to detect recursion in page tracking. */ - unsigned in_page_owner:1; -#endif #ifdef CONFIG_EVENTFD /* Recursion prevention for eventfd_signal() */ unsigned in_eventfd_signal:1;