projects/linux·commit d8941ce5

Merge tag 'ras_core_for_v6.9_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

d8941ce5 · Linus Torvalds <[email protected]> · 2024-03-11 17:22:57 -07:00

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
Commit
d8941ce52b708cfd520994e65760a2fa6a646dfb
Parents
bff4b746 · a6a78916

Merge commit. Changes below are compared with the first parent: bff4b746.

Changes

1 files changed · +1 −1

FileStatusAddDelContent
arch/x86/kernel/cpu/mce/core.cmodified+1−1View file

arch/x86/kernel/cpu/mce/core.c

View file
diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
index 04acdc3..b5cc557 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",
};