Hi all,
After merging the tip tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
kernel/smp.c: In function 'csd_lock_wait_getcpu':
kernel/smp.c:133:13: error: 'call_single_data_t' {aka 'struct __call_single_data'} has no member named 'dst'
133 | return csd->dst; /* Other CSD_TYPE_ values might not have ->dst. */
| ^~
Caused by commit
545b8c8df41f ("smp: Cleanup smp_call_function*()")
[interacting with commit
35feb60474bf ("kernel/smp: Provide CSD lock timeout diagnostics")
from before v5.10-rc1]
I have applied the following patch for today:
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 27 Nov 2020 15:04:00 +1100
Subject: [PATCH] smp: fix up "smp: Cleanup smp_call_function*()"
An instance if "dst" was missed.
Fixes: 545b8c8df41f ("smp: Cleanup smp_call_function*()")
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
kernel/smp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/smp.c b/kernel/smp.c
index faf1a3ace6a9..1b6070bf97bb 100644
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -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;
}
--
2.29.2
--
Cheers,
Stephen Rothwell
Attachment:
pgpy6ONsplfND.pgp
Description: OpenPGP digital signature
