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

torvalds · torvalds · commit d8941ce52b70 · 2024-03-11T17:22:57.000-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
diff --git 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",
 };

Original file line number	Diff line number	Diff line change
`@@ -2457,7 +2457,7 @@ static void mce_enable_ce(void *all)`
`2457`	`2457`	`__mcheck_cpu_init_timer();`
`2458`	`2458`	`}`
`2459`	`2459`
`2460`		`-static struct bus_type mce_subsys = {`
	`2460`	`+static const struct bus_type mce_subsys = {`
`2461`	`2461`	`.name = "machinecheck",`
`2462`	`2462`	`.dev_name = "machinecheck",`
`2463`	`2463`	`};`