ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar
2020-11-27 11:09:57 +01:00
parent 2914b0ba61 85a2c56cb4
commit a787bdaff8
1807 changed files with 21317 additions and 37493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/smp.c
View File

@@ -130,7 +130,7 @@ static __always_inline int csd_lock_wait_getcpu(call_single_data_t *csd)
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;
}