lkml.org 
[lkml]   [2019]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.2 108/413] sched/core: Add __sched tag for io_schedule()
    Date
    [ 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/<pid>/wchan" will
    report io_schedule() rather than its callers when waiting for IO.

    Reported-by: Jilong Kou <koujilong@huawei.com>
    Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Acked-by: Tejun Heo <tj@kernel.org>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Miao Xie <miaoxie@huawei.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    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 <mingo@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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


    \
     
     \ /
      Last update: 2019-07-24 21:28    [W:4.043 / U:0.916 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site