Advertisement
Guest User

Untitled

a guest
Aug 10th, 2018
138
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. --- patch-4.17-ck1 2018-08-10 01:06:12.469556920 -0700
  2. +++ patch-4.17-ck1.mine 2018-08-10 01:26:30.618958195 -0700
  3. @@ -5204,7 +5204,7 @@
  4. set_current_state(TASK_UNINTERRUPTIBLE);
  5. - schedule_timeout(msecs_to_jiffies(BAUDRATE_SETTLE_TIMEOUT_MS));
  6. + schedule_msec_hrtimeout((BAUDRATE_SETTLE_TIMEOUT_MS));
  7. - set_current_state(TASK_INTERRUPTIBLE);
  8. + set_current_state(TASK_RUNNING);
  9.  
  10. return 0;
  11. diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
  12. @@ -14909,20 +14909,12 @@
  13. index e13df951aca7..f6fd85f77a43 100644
  14. --- a/kernel/sched/cpufreq_schedutil.c
  15. +++ b/kernel/sched/cpufreq_schedutil.c
  16. -@@ -185,11 +185,11 @@ static unsigned long sugov_aggregate_util(struct sugov_cpu *sg_cpu)
  17. +@@ -185,4 +185,4 @@ static unsigned long sugov_aggregate_util(struct sugov_cpu *sg_cpu)
  18. struct rq *rq = cpu_rq(sg_cpu->cpu);
  19. - unsigned long util;
  20. -
  21. -- if (rq->rt.rt_nr_running) {
  22. -+ if (rq_rt_nr_running(rq)) {
  23. - util = sg_cpu->max;
  24. - } else {
  25. - util = sg_cpu->util_dl;
  26. -- if (rq->cfs.h_nr_running)
  27. -+ if (rq_h_nr_running(rq))
  28. - util += sg_cpu->util_cfs;
  29. - }
  30.  
  31. +- if (rq->rt.rt_nr_running)
  32. ++ if (rq_rt_nr_running(rq))
  33. + return sg_cpu->max;
  34. @@ -474,7 +474,11 @@ static int sugov_kthread_create(struct sugov_policy *sg_policy)
  35. struct task_struct *thread;
  36. struct sched_attr attr = {
Advertisement
Advertisement
Advertisement
RAW Paste Data Copied
Advertisement