github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 11:03:43 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Modules fixes for v6.13-rc5

Browse Source 
Luis asked me to look after the modules maintenance for a while, with the
 plan to rotate it with other recently added modules maintainers/reviewers.
 This is my first pull request to you.
 
 A single fix is present to correct the module vermagic for PREEMPT_RT.
 -----BEGIN PGP SIGNATURE-----
 
 iQFIBAABCAAyFiEEIduBR9MnFA82q/jtumpXJwqY6poFAmdpOt0UHHBldHIucGF2
 bHVAc3VzZS5jb20ACgkQumpXJwqY6pqQOwf/atyA9cyVCnp3ePjefjA0tJ2r59bh
 dEm47kjXZDwlMQ8nBBdT6nA7V0bZ0XF5ToHGwo5Uqgpj+MEilH1xz6KSw+V/uX0R
 YNtFQLN+eiiiNUMBR9R3IMmF+nNgcqEpgtCJDNpgiuCgmtlGr/yRwyqCEt4r9fzJ
 jHRjs6pqcpOzhn5fGrepQLOzVnsn7M0uzYMlkMdSWk2Y821wgJC3f/die9vCGIhg
 G3LdVOgMgKEKIwdZ1S9OYWrPFARiA4/SDX+3apN08FSAcnYi/bUalcjFkufYqkr6
 1q+DdsQJnoqOC4C//6MQzYCCGwQOF2VQQf2HB/GkicUpZjWU7Mk+5Entbg==
 =1BYy
 -----END PGP SIGNATURE-----

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.
This commit is contained in:
Linus Torvalds 2024-12-23 13:06:48 -08:00
commit ef49c460ab
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/vermagic.h
View File

@ -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