From: Ingo Molnar <mingo@kernel.org>
Date: Fri, 27 Nov 2020 10:09:57 +0000 (+0100)
Subject: Merge branch 'linus' into sched/core, to resolve semantic conflict
X-Git-Tag: microblaze-v5.12~10^2~7
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=a787bdaff83a085288b6fc607afb4bb648da3cc9;p=linux-2.6-microblaze.git

Merge branch 'linus' into sched/core, to resolve semantic conflict

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

a787bdaff83a085288b6fc607afb4bb648da3cc9
diff --cc kernel/sched/core.c
index b943b459b77a,e7e453492cff..a7abbba98083
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@@ -3436,8 -2961,13 +3436,13 @@@ try_to_wake_up(struct task_struct *p, u
  	 */
  	smp_cond_load_acquire(&p->on_cpu, !VAL);
  
 -	cpu = select_task_rq(p, p->wake_cpu, SD_BALANCE_WAKE, wake_flags);
 +	cpu = select_task_rq(p, p->wake_cpu, wake_flags | WF_TTWU);
  	if (task_cpu(p) != cpu) {
+ 		if (p->in_iowait) {
+ 			delayacct_blkio_end(p);
+ 			atomic_dec(&task_rq(p)->nr_iowait);
+ 		}
+ 
  		wake_flags |= WF_MIGRATED;
  		psi_ttwu_dequeue(p);
  		set_task_cpu(p, cpu);
diff --cc kernel/smp.c
index faf1a3ace6a9,4d17501433be..1b6070bf97bb
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@@ -130,7 -130,7 +130,7 @@@ static __always_inline int csd_lock_wai
  
  	csd_type = CSD_TYPE(csd);
  	if (csd_type == CSD_TYPE_ASYNC || csd_type == CSD_TYPE_SYNC)
--		return csd->dst; /* Other CSD_TYPE_ values might not have ->dst. */
++		return csd->node.dst; /* Other CSD_TYPE_ values might not have ->dst. */
  	return -1;
  }