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

Commit 2e7e98b8 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'ras_fixlet_for_3.11' of... 

Merge tag 'ras_fixlet_for_3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras

 into x86/ras

Pull "Fix typo in define" change from Borislav Petkov.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 17858ca6 a9093684

arch/x86/include/asm/mce.h

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
#define MCJ_CTX_IRQ		0x2  /* inject context: IRQ */

#define MCJ_NMI_BROADCAST	0x4  /* do NMI broadcasting */

#define MCJ_EXCEPTION		0x8  /* raise as exception */

#define MCJ_IRQ_BRAODCAST	0x10 /* do IRQ broadcasting */

#define MCJ_IRQ_BROADCAST	0x10 /* do IRQ broadcasting */



#define MCE_OVERFLOW 0		/* bit 0 in flags means overflow */

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

+2 −2
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static void raise_mce(struct mce *m) 
		return;



#ifdef CONFIG_X86_LOCAL_APIC

	if (m->inject_flags & (MCJ_IRQ_BRAODCAST | MCJ_NMI_BROADCAST)) {

	if (m->inject_flags & (MCJ_IRQ_BROADCAST | MCJ_NMI_BROADCAST)) {

		unsigned long start;

		int cpu;
@@ -167,7 +167,7 @@ static void raise_mce(struct mce *m) 
				cpumask_clear_cpu(cpu, mce_inject_cpumask);

		}

		if (!cpumask_empty(mce_inject_cpumask)) {

			if (m->inject_flags & MCJ_IRQ_BRAODCAST) {

			if (m->inject_flags & MCJ_IRQ_BROADCAST) {

				/*

				 * don't wait because mce_irq_ipi is necessary

				 * to be sync with following raise_local