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=ham 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 D3BA4C7618F for ; Mon, 15 Jul 2019 13:53:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A25CD2081C for ; Mon, 15 Jul 2019 13:53:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563198815; bh=J3RpHfwQRjznVCVp7vD3P6Q2TVEj4ZYGGElLDfqm4KQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2q2zNIbn1xx+TP5xh8RgVqbozXRbLnWK2FbJohPoNphPu9CckZyTnx0BYttmxezgT p/67rrnxKfsyFL696WAEyOOU3MRLAP1BFXjUHsK0hpc0irLN3h6W3vhhwNtpV31zmf f7FVE/uC/y6nRyky28SsxMYTl77qhYkHvjONZ26M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732414AbfGONxe (ORCPT ); Mon, 15 Jul 2019 09:53:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:51706 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731352AbfGONxd (ORCPT ); Mon, 15 Jul 2019 09:53:33 -0400 Received: from sasha-vm.mshome.net (unknown [73.61.17.35]) (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 0EAFA2083D; Mon, 15 Jul 2019 13:53:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563198813; bh=J3RpHfwQRjznVCVp7vD3P6Q2TVEj4ZYGGElLDfqm4KQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EWX+xhkWswNnBQ4uhYtnO1wtTdrZRwU5bipIwbp1WdHMOLDUQ7VclJKzLVwEtDNU3 mIUOtAgAxf2P3tAvbKU/axjXLhpYzMYvB3F8I9w+59xR9zG9PlkJSEzUNWwfVL6KQf KQ0/++pByAc6cAiQQRg2hcOR+SBMUSInPh99H76M= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Gao Xiang , Jilong Kou , Peter Zijlstra , Tejun Heo , Andrew Morton , Linus Torvalds , Miao Xie , Thomas Gleixner , Ingo Molnar , Sasha Levin Subject: [PATCH AUTOSEL 5.2 111/249] sched/core: Add __sched tag for io_schedule() Date: Mon, 15 Jul 2019 09:44:36 -0400 Message-Id: <20190715134655.4076-111-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190715134655.4076-1-sashal@kernel.org> References: <20190715134655.4076-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Gao Xiang [ Upstream commit e3b929b0a184edb35531153c5afcaebb09014f9d ] Non-inline io_schedule() was introduced in: commit 10ab56434f2f ("sched/core: Separate out io_schedule_prepare() and io_schedule_finish()") Keep in line with io_schedule_timeout(), otherwise "/proc//wchan" will report io_schedule() rather than its callers when waiting for IO. Reported-by: Jilong Kou Signed-off-by: Gao Xiang Signed-off-by: Peter Zijlstra (Intel) Acked-by: Tejun Heo Cc: Andrew Morton Cc: Linus Torvalds Cc: Miao Xie Cc: Peter Zijlstra Cc: Thomas Gleixner Fixes: 10ab56434f2f ("sched/core: Separate out io_schedule_prepare() and io_schedule_finish()") Link: https://lkml.kernel.org/r/20190603091338.2695-1-gaoxiang25@huawei.com Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- kernel/sched/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 874c427742a9..4d5962232a55 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -5123,7 +5123,7 @@ long __sched io_schedule_timeout(long timeout) } EXPORT_SYMBOL(io_schedule_timeout); -void io_schedule(void) +void __sched io_schedule(void) { int token; -- 2.20.1