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

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

Merge branches 'x86-ras-for-linus', 'x86-uv-for-linus' and... 

Merge branches 'x86-ras-for-linus', 'x86-uv-for-linus' and 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 ras, uv and vdso fixlets from Ingo Molnar:
 "ras: tone down a kernel message to only occur during initial bootup,
    not during suspend/resume cycles.

  uv: a cleanup commit

  vdso: a fix to error checking"

* 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mce: Avoid showing repetitive message from intel_init_thermal()

* 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/apic/uv: Remove unnecessary #ifdef

* 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/vdso: Fix vdso2c's special_pages[] error checking
parents 2fd7476d d286c3af 8091c1f8 f12c1f90

arch/x86/kernel/apic/x2apic_uv_x.c

+0 −2
Original line number Diff line number Diff line
@@ -204,7 +204,6 @@ EXPORT_SYMBOL(sn_rtc_cycles_per_second); 


static int uv_wakeup_secondary(int phys_apicid, unsigned long start_rip)

{

#ifdef CONFIG_SMP

	unsigned long val;

	int pnode;
@@ -223,7 +222,6 @@ static int uv_wakeup_secondary(int phys_apicid, unsigned long start_rip) 
	uv_write_global_mmr64(pnode, UVH_IPI_INT, val);



	atomic_set(&init_deasserted, 1);

#endif

	return 0;

}

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

+2 −2
Original line number Diff line number Diff line
@@ -498,8 +498,8 @@ void intel_init_thermal(struct cpuinfo_x86 *c) 




	if ((l & MSR_IA32_MISC_ENABLE_TM1) && (h & APIC_DM_SMI)) {

		printk(KERN_DEBUG

		       "CPU%d: Thermal monitoring handled by SMI\n", cpu);

		if (system_state == SYSTEM_BOOTING)

			printk(KERN_DEBUG "CPU%d: Thermal monitoring handled by SMI\n", cpu);

		return;

	}

arch/x86/vdso/vdso2c.h

+7 −5
Original line number Diff line number Diff line
@@ -109,16 +109,18 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len, 


	/* Validate mapping addresses. */

	for (i = 0; i < sizeof(special_pages) / sizeof(special_pages[0]); i++) {

		if (!syms[i])

		INT_BITS symval = syms[special_pages[i]];



		if (!symval)

			continue;  /* The mapping isn't used; ignore it. */



		if (syms[i] % 4096)

		if (symval % 4096)

			fail("%s must be a multiple of 4096\n",

			     required_syms[i].name);

		if (syms[sym_vvar_start] > syms[i] + 4096)

			fail("%s underruns begin_vvar\n",

		if (symval + 4096 < syms[sym_vvar_start])

			fail("%s underruns vvar_start\n",

			     required_syms[i].name);

		if (syms[i] + 4096 > 0)

		if (symval + 4096 > 0)

			fail("%s is on the wrong side of the vdso text\n",

			     required_syms[i].name);

	}