diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2024-12-23 13:06:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-12-23 13:06:48 -0800 |
| commit | ef49c460ab89d3d0ccc01c0ac3b55a47927ec6d5 (patch) | |
| tree | 69a0caa553873f4836412fda077596f2746fd258 | |
| parent | Merge tag 'nfsd-6.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux (diff) | |
| parent | preempt: Move PREEMPT_RT before PREEMPT in vermagic. (diff) | |
| download | wireguard-linux-ef49c460ab89d3d0ccc01c0ac3b55a47927ec6d5.tar.xz wireguard-linux-ef49c460ab89d3d0ccc01c0ac3b55a47927ec6d5.zip | |
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.
Diffstat (limited to '')
| -rw-r--r-- | include/linux/vermagic.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h index a54046bf37e5..939ceabcaf06 100644 --- a/include/linux/vermagic.h +++ b/include/linux/vermagic.h @@ -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 |