Skip to content

Commit ef49c46

Browse files
committed
Merge tag 'modules-6.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/modules/linux
Pull modules fix from Petr Pavlu: "A single fix is present to correct the module vermagic for PREEMPT_RT" * tag 'modules-6.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/modules/linux: preempt: Move PREEMPT_RT before PREEMPT in vermagic.
2 parents f07044d + 0b7a66a commit ef49c46

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

include/linux/vermagic.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
#else
1616
#define MODULE_VERMAGIC_SMP ""
1717
#endif
18-
#ifdef CONFIG_PREEMPT_BUILD
19-
#define MODULE_VERMAGIC_PREEMPT "preempt "
20-
#elif defined(CONFIG_PREEMPT_RT)
18+
#ifdef CONFIG_PREEMPT_RT
2119
#define MODULE_VERMAGIC_PREEMPT "preempt_rt "
20+
#elif defined(CONFIG_PREEMPT_BUILD)
21+
#define MODULE_VERMAGIC_PREEMPT "preempt "
2222
#else
2323
#define MODULE_VERMAGIC_PREEMPT ""
2424
#endif

0 commit comments

Comments
 (0)