diff options
author | Linus Torvalds | 2024-03-11 17:22:57 -0700 |
---|---|---|
committer | Linus Torvalds | 2024-03-11 17:22:57 -0700 |
commit | d8941ce52b708cfd520994e65760a2fa6a646dfb (patch) | |
tree | 12a5904db21de1f5de14deeb249cf18c23ef8b0b /arch/x86 | |
parent | bff4b74625fea851f9dd61e747a162d2f6b3317e (diff) | |
parent | a6a789165bbdb506b784f53b7467dbe0210494ad (diff) |
Merge tag 'ras_core_for_v6.9_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull RAS fixlet from Borislav Petkov:
- Constify yet another static struct bus_type instance now that the
driver core can handle that
* tag 'ras_core_for_v6.9_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/mce: Make mce_subsys const
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/cpu/mce/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index 04acdc3534c8..b5cc557cfc37 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -2457,7 +2457,7 @@ static void mce_enable_ce(void *all) __mcheck_cpu_init_timer(); } -static struct bus_type mce_subsys = { +static const struct bus_type mce_subsys = { .name = "machinecheck", .dev_name = "machinecheck", }; |