diff options
| author | Gao Xiang | 2019-06-03 11:13:38 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-07-26 09:14:08 +0200 |
| commit | d8b7db6c500419795d2d3c5a4a76fbaabdcfaa01 (patch) | |
| tree | 66d57f99f87095fdb8d8052f1d365e844297cc46 /kernel | |
| parent | xfrm: fix sa selector validation (diff) | |
| download | kernel-qcow2-linux-d8b7db6c500419795d2d3c5a4a76fbaabdcfaa01.tar.gz kernel-qcow2-linux-d8b7db6c500419795d2d3c5a4a76fbaabdcfaa01.tar.xz kernel-qcow2-linux-d8b7db6c500419795d2d3c5a4a76fbaabdcfaa01.zip | |
sched/core: Add __sched tag for io_schedule()
[ 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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 6859ea1d5c04..795c63ca44a9 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -5133,7 +5133,7 @@ long __sched io_schedule_timeout(long timeout) } EXPORT_SYMBOL(io_schedule_timeout); -void io_schedule(void) +void __sched io_schedule(void) { int token; |