Commit ef49c460 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents f07044dd 0b7a66a2

include/linux/vermagic.h

+3 −3
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ 
#else

#define MODULE_VERMAGIC_SMP ""

#endif

#ifdef CONFIG_PREEMPT_BUILD

#define MODULE_VERMAGIC_PREEMPT "preempt "

#elif defined(CONFIG_PREEMPT_RT)

#ifdef CONFIG_PREEMPT_RT

#define MODULE_VERMAGIC_PREEMPT "preempt_rt "

#elif defined(CONFIG_PREEMPT_BUILD)

#define MODULE_VERMAGIC_PREEMPT "preempt "

#else

#define MODULE_VERMAGIC_PREEMPT ""

#endif