From patchwork Mon Jul 24 14:23:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 125051 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1845366vqg; Mon, 24 Jul 2023 07:41:20 -0700 (PDT) X-Google-Smtp-Source: APBJJlHPK8OtIkV8gSyKYaQIUbtF/IiTO9D21xLscoz7m13MmLi84KOTGZRVygNQ8aKojcrZiWxV X-Received: by 2002:a17:903:2283:b0:1b9:ce7a:88b4 with SMTP id b3-20020a170903228300b001b9ce7a88b4mr11068195plh.42.1690209679676; Mon, 24 Jul 2023 07:41:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690209679; cv=none; d=google.com; s=arc-20160816; b=YD+Ctll9uyLHvMrLrYei5vJSSlkuSv/47jN369EUzam0b8jklIuiZN3tXWPNFT5ydJ 6MalKGaHUvKGBgI359cnyMlVWuVavWHoJdab0mQnmkSK26H3jp3EMB8mlLdwKPC8hStY ruVilCEhm5YNX9vSmRnvAdDqPI6yUN9ODNc5j3293m/932kbqru4/A8/0zXnM1k/dAr7 riWHI04wbIkL0CQRwvg+3REpV1h0SEykPvH9b1mvIGOba5syTCzchR7WxJk/ZphQ3k+i ScEeNaD/JXq0Yh2NPO19/QrKijSVqAeC+djnsFWLvPqxIHyEkUCrwEXPVlRMAC0y5hu3 uUpw== 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=YO4lbXFjzCvLUNvI4SzA9Dc49cJY2vyf1w3e1N1EURI=; fh=nkywzdHrAYznZY8LjxGueMrks6dsA4pFCjhiXc1n5KQ=; b=bMH03vnDgNHgqk4KkMLm6vNC4kh0LFMbZpRZRrJ1l6N06SHvSdKAx3+PnACf3dx4dw NZdNc6pXs8OpzukpR/ePnp36Z4e02PdHZn207dL67NpCg52gNV+SHbNqetw9AMh+po2c GN30AF1RZp/weB59qF89X/UrpS7EeWN0MzJYyWWWlKI6LL9dMQaUODeBh8TpSwwrPEIU U2h5ud1QQctR/oVaqUz2u9n4ZGTnAak0v00cvTWYh2DA8wCETF6K9KvuWhkn1yZimpzq rHu3V5vs99oHlCn39Unn/nzinWWlId+d7jjSzEoQ8t06yNdcZcNtKNsWMl7a7G5Rg/p4 Xhnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=mhdAnaFo; 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 s16-20020a170902ea1000b001b8c5175a86si10267887plg.542.2023.07.24.07.41.06; Mon, 24 Jul 2023 07:41:19 -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=mhdAnaFo; 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 S231696AbjGXOXR (ORCPT + 99 others); Mon, 24 Jul 2023 10:23:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49070 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232007AbjGXOXI (ORCPT ); Mon, 24 Jul 2023 10:23:08 -0400 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA4B6B7 for ; Mon, 24 Jul 2023 07:23:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1690208587; x=1721744587; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=OKaORiHPT85EF1/YMUxfys0MZti+NzPzdfUSYLi2rfU=; b=mhdAnaFob76q0xfTpWh8NletCua2+2t0R1LcXMmVTe/tRQ01m2POuPh4 ugVjxxBxn2o9R751pbQ0iEkH8fArWhAQWSdT1R6JD8lLl25COdhn0OndL XHqbM1ffymOMT8BHLKTiCyBr7caZt9WkFQ7Vmto4VpfCdS4dzrQeE1HWI qNLKXLNBSs6YSekinCtrOrJm1IGaLsOZDgdPRfyE5jpIxJmXWgy7uDwVd d053Vix/nL8QJn6ti/4UoYBtKw8LkH+xBLxXhben2tjetT5IT4uFsWaGr klUNDpoajOff/xG0wgHu8MSuOLIB9wkFUmeIF2ycaiv38rfPqCQRv7pZF g==; X-IronPort-AV: E=McAfee;i="6600,9927,10781"; a="357452189" X-IronPort-AV: E=Sophos;i="6.01,228,1684825200"; d="scan'208";a="357452189" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jul 2023 07:23:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10781"; a="755319107" X-IronPort-AV: E=Sophos;i="6.01,228,1684825200"; d="scan'208";a="755319107" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga008.jf.intel.com with ESMTP; 24 Jul 2023 07:23:04 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 77B501A6; Mon, 24 Jul 2023 17:23:12 +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 Subject: [PATCH v1 1/1] Revert "um: Use swap() to make code cleaner" Date: Mon, 24 Jul 2023 17:23:07 +0300 Message-Id: <20230724142307.28411-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: 1772313305227739474 This reverts commit 9b0da3f22307af693be80f5d3a89dc4c7f360a85. The sigio.h 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. Closes: https://lore.kernel.org/oe-kbuild-all/202307212304.cH79zJp1-lkp@intel.com/ Signed-off-by: Andy Shevchenko --- 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 {