Merge branches 'x86-ras-for-linus', 'x86-uv-for-linus' and... (77654908) · Commits · 戴 / test

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;
		}

+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;
		}

+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);
		}