Skip to content

4.14.15 incompatible change #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 19, 2018
Merged

4.14.15 incompatible change #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions kernel/sched/MuQSS.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
#include <linux/tick.h>
#include <linux/version.h>

#include <asm/switch_to.h>
#include <asm/tlb.h>
Expand Down Expand Up @@ -1959,7 +1960,11 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
p->state = TASK_WAKING;

if (p->in_iowait) {
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 15)
delayacct_blkio_end();
#else
delayacct_blkio_end(p);
#endif
atomic_dec(&task_rq(p)->nr_iowait);
}

Expand All @@ -1970,7 +1975,11 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
#else /* CONFIG_SMP */

if (p->in_iowait) {
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 15)
delayacct_blkio_end();
#else
delayacct_blkio_end(p);
#endif
atomic_dec(&task_rq(p)->nr_iowait);
}

Expand Down Expand Up @@ -2022,7 +2031,11 @@ static void try_to_wake_up_local(struct task_struct *p)

if (!task_on_rq_queued(p)) {
if (p->in_iowait) {
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 15)
delayacct_blkio_end();
#else
delayacct_blkio_end(p);
#endif
atomic_dec(&rq->nr_iowait);
}
ttwu_activate(rq, p);
Expand Down