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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 44FACC76186 for ; Wed, 24 Jul 2019 19:27:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 17D4E22ADC for ; Wed, 24 Jul 2019 19:27:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563996478; bh=m6eIVnmoie5rpim9BfCOEBtVArBAcM30e7faLAeTqdg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ndkg7FXMH0eldc3CtZVJdf6rADfeH9Kw9oihwNWvb59YvuRIfAgBCT1Fzi14Mdhqj 54GidRovkX+UKzFJZTcKtZ+z21VtsKMmcUPxvSRtbEONXidytXjeWZm2laKKTHJErc PPWmna0yIsYKvWVEKK2TXHccsTXvjSsrXdtDEoow= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727379AbfGXT15 (ORCPT ); Wed, 24 Jul 2019 15:27:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:45924 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728772AbfGXT14 (ORCPT ); Wed, 24 Jul 2019 15:27:56 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CC440229F3; Wed, 24 Jul 2019 19:27:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563996475; bh=m6eIVnmoie5rpim9BfCOEBtVArBAcM30e7faLAeTqdg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZNnKWqfAkCzKlYQWtpDRBTCmu2w26OMsqYjq6q7kGng8VvR7wrOlv5z50L6SFNmTa rs5gXe+ZXjOTuBaAI/m70HrfZxn9Eve1yTeFf5Le4SEjlXj2Sv89z+kpVdJMQmizNx /arVUe9azodj5aOiNcrCezdMn+K9oecZMS6IhQ8g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jilong Kou , Gao Xiang , "Peter Zijlstra (Intel)" , Tejun Heo , Andrew Morton , Linus Torvalds , Miao Xie , Thomas Gleixner , Ingo Molnar , Sasha Levin Subject: [PATCH 5.2 108/413] sched/core: Add __sched tag for io_schedule() Date: Wed, 24 Jul 2019 21:16:39 +0200 Message-Id: <20190724191743.027532780@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191735.096702571@linuxfoundation.org> References: <20190724191735.096702571@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ 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