Commit d8941ce5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents bff4b746 a6a78916

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

+1 −1
Original line number Diff line number Diff line
@@ -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",

};