From patchwork Mon Jul 24 14:31:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 125055 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1848290vqg; Mon, 24 Jul 2023 07:46:53 -0700 (PDT) X-Google-Smtp-Source: APBJJlH+c8jAXoeW0WGAE1qF77LoophnC2e5gLvDNuAm+gs1FWv/jneg5ihQ2afyf+w//1mje5Xc X-Received: by 2002:a17:906:15b:b0:993:e9b8:90f4 with SMTP id 27-20020a170906015b00b00993e9b890f4mr10981031ejh.8.1690210012723; Mon, 24 Jul 2023 07:46:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690210012; cv=none; d=google.com; s=arc-20160816; b=xKABe94yEyfknLLHIjFLixQG2udCymhsRLaqkLrZM4XcHyRe75Pl1Tqmax/IjE0H8j ldNBoElr8pqV1jf3Twlf8AQntj4tTbh6q32FaazHUaFdO/ySb8buCgldlNO65TeQIMVX gIa8HkyJc6+YEpkLcNbzNE3qnGanXaS2cDmTGPWeVaV5g/yilTyxK1HaEughos1mi3uh XcXhEo7dEWMzXlGoiLo+rAL1RXhvKcVDuSva5ZCJZwiRnwq+d7HQJqfkbTya48SVLwCy Y7sOniky+MSsimk5SVgb/GydpW8u9AmAZYJJfagWWrRXCfylIUvjNr03UkCI9XDK7gBE gxRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=WMepB1shdZjX+5FFN6io01MkmTUuvsuwG93xEbDNVv0=; fh=Kc0TT/GhLYzIG/zgXSxXX63EFRwkIjCf/lBa5/KuA6E=; b=FZMSplLJ4enT1bGYmBj05JUgQQmrpGgaAG5WpWUD33+Yvb/b44pGvuZZqz3p1I6N1V u+VGh2g0YnWpDTpG5vp1qiOIn+iSgfetqw/MzibgcPTbFuJ3SBo29+p3xj2NpJ9IEZy6 CKjgTrGxiMCTzpuDkqFUDyF5MU8w66Y5F0BkdEwfhBfQAzXM7fynK49doTD13NLaZYKy U6zMO6fMaBMNkrdz5hqnpmHhP7nN6aCdvrbuzkDpXZ0u4DfEy6/1qDI9WHG+zcuHf9f5 AS5MwMS3a+ggV0T4Foi9C5HNvQFq2Y+BY8LjmFAn03rSCWJSCE3Ia4jzGYIM/1JwL3IB 0knw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=fchlWQPx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q24-20020a170906b29800b00992083e604fsi6590355ejz.154.2023.07.24.07.46.28; Mon, 24 Jul 2023 07:46:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=fchlWQPx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230236AbjGXOby (ORCPT + 99 others); Mon, 24 Jul 2023 10:31:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230223AbjGXObv (ORCPT ); Mon, 24 Jul 2023 10:31:51 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51686A4 for ; Mon, 24 Jul 2023 07:31:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1690209110; x=1721745110; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=+5gG+0+scvDqbfX5/L0lqS4BwovP5AcRlSaFF9Lgp1c=; b=fchlWQPx2n/WHU9ps3TAMGDgiDhxgrdns4ok+8ShBg9gnGLW9nzZj1lt /38vPeUk1pKOsyTR0RJaDne6UGl/hEwdwX/qRsiQEv/iBELVox46SQFsD tkW+KObP/RcU38Br3cIrHOY5g08ANyVOUa0geWfuFInTk6fVvfQWxxIm6 1zhQIT30z/3H4yhZpz7PnxdblTCPYw3BAJ85zVbHitQM0jtcpGKGcm0Wk LsJrQA8J7htvyQb8ApoKKZ1n2/vqbH9WFAGV6oSkwYqRfZ2V0+TSzUG46 0y0ofH+C1bWy1Nuf4hSyrbkpajMIbAJc1gjz9ajXiA7EigBY36ES3Z4Wp Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10781"; a="398362893" X-IronPort-AV: E=Sophos;i="6.01,228,1684825200"; d="scan'208";a="398362893" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jul 2023 07:31:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10781"; a="790986713" X-IronPort-AV: E=Sophos;i="6.01,228,1684825200"; d="scan'208";a="790986713" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga008.fm.intel.com with ESMTP; 24 Jul 2023 07:31:24 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 08F591A6; Mon, 24 Jul 2023 17:31:32 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-um@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Richard Weinberger , Anton Ivanov , Johannes Berg , Rasmus Villemoes , Andrew Morton , Herve Codina , "Jason A. Donenfeld" , Yang Guang , kernel test robot Subject: [PATCH v2 1/1] Revert "um: Use swap() to make code cleaner" Date: Mon, 24 Jul 2023 17:31:31 +0300 Message-Id: <20230724143131.30090-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772313305227739474 X-GMAIL-MSGID: 1772313654360438200 This reverts commit 9b0da3f22307af693be80f5d3a89dc4c7f360a85. The sigio.c is clearly user space code which is handled by arch/um/scripts/Makefile.rules (see USER_OBJS rule). The above mentioned commit simply broke this agreement, we may not use Linux kernel internal headers in them without thorough thinking. Hence, revert the wrong commit. Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202307212304.cH79zJp1-lkp@intel.com/ Signed-off-by: Andy Shevchenko --- v2: fixed typo (h --> c), added Reported-by tag arch/um/os-Linux/sigio.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/um/os-Linux/sigio.c b/arch/um/os-Linux/sigio.c index 37d60e72cf26..9e71794839e8 100644 --- a/arch/um/os-Linux/sigio.c +++ b/arch/um/os-Linux/sigio.c @@ -3,7 +3,6 @@ * Copyright (C) 2002 - 2008 Jeff Dike (jdike@{addtoit,linux.intel}.com) */ -#include #include #include #include @@ -51,7 +50,7 @@ static struct pollfds all_sigio_fds; static int write_sigio_thread(void *unused) { - struct pollfds *fds; + struct pollfds *fds, tmp; struct pollfd *p; int i, n, respond_fd; char c; @@ -78,7 +77,9 @@ static int write_sigio_thread(void *unused) "write_sigio_thread : " "read on socket failed, " "err = %d\n", errno); - swap(current_poll, next_poll); + tmp = current_poll; + current_poll = next_poll; + next_poll = tmp; respond_fd = sigio_private[1]; } else {