From: Eder Zulian <ezulian@xxxxxxxxxx>
rust: Fix build error
When CONFIG_DEBUG_SPINLOCK=y and CONFIG_PREEMPT_RT=y the following build
error occurs:
In file included from rust/helpers/helpers.c:22:
rust/helpers/spinlock.c: In function ‘rust_helper___spin_lock_init’:
rust/helpers/spinlock.c:10:30: error: implicit declaration of function ‘spinlock_check’; did you mean ‘spin_lock_bh’? [-Wimplicit-function-declaration]
10 | __raw_spin_lock_init(spinlock_check(lock), name, key, LD_WAIT_CONFIG);
| ^~~~~~~~~~~~~~
| spin_lock_bh
rust/helpers/spinlock.c:10:30: error: passing argument 1 of ‘__raw_spin_lock_init’ makes pointer from integer without a cast [-Wint-conversion]
10 | __raw_spin_lock_init(spinlock_check(lock), name, key, LD_WAIT_CONFIG);
| ^~~~~~~~~~~~~~~~~~~~
| |
| int
In file included from ./include/linux/wait.h:9,
from ./include/linux/wait_bit.h:8,
from ./include/linux/fs.h:6,
from ./include/linux/highmem.h:5,
from ./include/linux/bvec.h:10,
from ./include/linux/blk_types.h:10,
from ./include/linux/blkdev.h:9,
from ./include/linux/blk-mq.h:5,
from rust/helpers/blk.c:3,
from rust/helpers/helpers.c:10:
./include/linux/spinlock.h:101:52: note: expected ‘raw_spinlock_t *’ {aka ‘struct raw_spinlock *’} but argument is of type ‘int’
101 | extern void __raw_spin_lock_init(raw_spinlock_t *lock, const char *name,
| ~~~~~~~~~~~~~~~~^~~~
make[2]: *** [scripts/Makefile.build:229: rust/helpers/helpers.o] Error 1
Error observed while building a rt-debug kernel for aarch64.
On a PREEMPT_RT build, spin locks have been mapped to rt_mutex types, so
avoid the raw_spinlock_init call for RT.
Suggested-by: Clark Williams <williams@xxxxxxxxxx>
Signed-off-by: Eder Zulian <ezulian@xxxxxxxxxx>
diff --git a/rust/helpers/spinlock.c b/rust/helpers/spinlock.c
index blahblah..blahblah 100644
--- a/rust/helpers/spinlock.c
+++ b/rust/helpers/spinlock.c
@@ -6,7 +6,7 @@
void rust_helper___spin_lock_init(spinlock_t *lock, const char *name,
struct lock_class_key *key)
{
-#ifdef CONFIG_DEBUG_SPINLOCK
+#if defined(CONFIG_DEBUG_SPINLOCK) && !defined(CONFIG_PREEMPT_RT)
__raw_spin_lock_init(spinlock_check(lock), name, key, LD_WAIT_CONFIG);
#else
spin_lock_init(lock);
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3441
--
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
