Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8670590 authored by Juergen Gross's avatar Juergen Gross Committed by Thomas Gleixner
Browse files

x86/MCE, xen/mcelog: Make /dev/mcelog registration messages more precise 



When running under Xen as dom0, /dev/mcelog is being provided by Xen
instead of the normal mcelog character device of the MCE core. Convert
an error message being issued by the MCE core in this case to an
informative message that Xen has registered the device.

Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: xen-devel@lists.xenproject.org
Cc: Tony Luck <tony.luck@intel.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: http://lkml.kernel.org/r/20170614084059.19294-1-jgross@suse.com
parent 6057077f

arch/x86/kernel/cpu/mcheck/dev-mcelog.c

+7 −1
Original line number Diff line number Diff line
@@ -415,9 +415,15 @@ static __init int dev_mcelog_init_device(void) 
	/* register character device /dev/mcelog */

	err = misc_register(&mce_chrdev_device);

	if (err) {

		if (err == -EBUSY)

			/* Xen dom0 might have registered the device already. */

			pr_info("Unable to init device /dev/mcelog, already registered");

		else

			pr_err("Unable to init device /dev/mcelog (rc: %d)\n", err);



		return err;

	}



	mce_register_decode_chain(&dev_mcelog_nb);

	return 0;

}

drivers/xen/mcelog.c

+2 −0
Original line number Diff line number Diff line
@@ -408,6 +408,8 @@ static int __init xen_late_init_mcelog(void) 
	if (ret)

		goto deregister;



	pr_info("/dev/mcelog registered by Xen\n");



	return 0;



deregister: