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

Commit 3ccfcdc9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull RAS fix from Thomas Gleixner:
 "Prevent dmesg from being spammed when MCE logging is active"

* 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mce: Don't print MCEs when mcelog is active
parents a71c9a1c cc66afea

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

+6 −1
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ 


static DEFINE_MUTEX(mce_chrdev_read_mutex);



static int mce_chrdev_open_count;	/* #times opened */



#define mce_log_get_idx_check(p) \

({ \

	RCU_LOCKDEP_WARN(!rcu_read_lock_sched_held() && \
@@ -598,6 +600,10 @@ static int mce_default_notifier(struct notifier_block *nb, unsigned long val, 
	if (atomic_read(&num_notifiers) > 2)

		return NOTIFY_DONE;



	/* Don't print when mcelog is running */

	if (mce_chrdev_open_count > 0)

		return NOTIFY_DONE;



	__print_mce(m);



	return NOTIFY_DONE;
@@ -1828,7 +1834,6 @@ void mcheck_cpu_clear(struct cpuinfo_x86 *c) 
 */



static DEFINE_SPINLOCK(mce_chrdev_state_lock);

static int mce_chrdev_open_count;	/* #times opened */

static int mce_chrdev_open_exclu;	/* already open exclusive? */



static int mce_chrdev_open(struct inode *inode, struct file *file)