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

Commit 1ca0049f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 fixes from Ingo Molnar:
 "Various fixes"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86-64, kcmp: The kcmp system call can be common
  arch/x86/kernel/kdebugfs.c: Ensure a consistent return value in error case
  x86/mce: Add quirk for instruction recovery on Sandy Bridge processors
  x86/mce: Move MCACOD defines from mce-severity.c to <asm/mce.h>
  x86/ioapic: Fix NULL pointer dereference on CPU hotplug after disabling irqs
  x86, nops: Missing break resulting in incorrect selection on Intel
  x86: CONFIG_CC_STACKPROTECTOR=y is no longer experimental
parents ddc5057c eaf4ce6c

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1527,7 +1527,7 @@ config SECCOMP 
	  If unsure, say Y. Only embedded should say N here.



config CC_STACKPROTECTOR

	bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"

	bool "Enable -fstack-protector buffer overflow detection"

	---help---

	  This option turns on the -fstack-protector GCC feature. This

	  feature puts, at the beginning of functions, a canary value on

arch/x86/include/asm/mce.h

+8 −0
Original line number Diff line number Diff line
@@ -33,6 +33,14 @@ 
#define MCI_STATUS_PCC   (1ULL<<57)  /* processor context corrupt */

#define MCI_STATUS_S	 (1ULL<<56)  /* Signaled machine check */

#define MCI_STATUS_AR	 (1ULL<<55)  /* Action required */

#define MCACOD		  0xffff     /* MCA Error Code */



/* Architecturally defined codes from SDM Vol. 3B Chapter 15 */

#define MCACOD_SCRUB	0x00C0	/* 0xC0-0xCF Memory Scrubbing */

#define MCACOD_SCRUBMSK	0xfff0

#define MCACOD_L3WB	0x017A	/* L3 Explicit Writeback */

#define MCACOD_DATA	0x0134	/* Data Load */

#define MCACOD_INSTR	0x0150	/* Instruction Fetch */



/* MCi_MISC register defines */

#define MCI_MISC_ADDR_LSB(m)	((m) & 0x3f)

arch/x86/kernel/alternative.c

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ void __init arch_init_ideal_nops(void) 
			ideal_nops = intel_nops;

#endif

		}



		break;

	default:

#ifdef CONFIG_X86_64

		ideal_nops = k8_nops;

arch/x86/kernel/apic/io_apic.c

+2 −2
Original line number Diff line number Diff line
@@ -1204,7 +1204,7 @@ static void __clear_irq_vector(int irq, struct irq_cfg *cfg) 
	BUG_ON(!cfg->vector);



	vector = cfg->vector;

	for_each_cpu(cpu, cfg->domain)

	for_each_cpu_and(cpu, cfg->domain, cpu_online_mask)

		per_cpu(vector_irq, cpu)[vector] = -1;



	cfg->vector = 0;
@@ -1212,7 +1212,7 @@ static void __clear_irq_vector(int irq, struct irq_cfg *cfg) 


	if (likely(!cfg->move_in_progress))

		return;

	for_each_cpu(cpu, cfg->old_domain) {

	for_each_cpu_and(cpu, cfg->old_domain, cpu_online_mask) {

		for (vector = FIRST_EXTERNAL_VECTOR; vector < NR_VECTORS;

								vector++) {

			if (per_cpu(vector_irq, cpu)[vector] != irq)

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

+0 −7
Original line number Diff line number Diff line
@@ -55,13 +55,6 @@ static struct severity { 
#define MCI_UC_S (MCI_STATUS_UC|MCI_STATUS_S)

#define MCI_UC_SAR (MCI_STATUS_UC|MCI_STATUS_S|MCI_STATUS_AR)

#define	MCI_ADDR (MCI_STATUS_ADDRV|MCI_STATUS_MISCV)

#define MCACOD 0xffff

/* Architecturally defined codes from SDM Vol. 3B Chapter 15 */

#define MCACOD_SCRUB	0x00C0	/* 0xC0-0xCF Memory Scrubbing */

#define MCACOD_SCRUBMSK	0xfff0

#define MCACOD_L3WB	0x017A	/* L3 Explicit Writeback */

#define MCACOD_DATA	0x0134	/* Data Load */

#define MCACOD_INSTR	0x0150	/* Instruction Fetch */



	MCESEV(

		NO, "Invalid",