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

Commit 3f86ba5d 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:
 "This contains two fixes: a boot fix for older SGI/UV systems, and an
  APIC calibration fix"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/tsc: Read all ratio bits from MSR_PLATFORM_INFO
  x86/platform/UV: Bring back the call to map_low_mmrs in uv_system_init
parents 01ec7167 886123fb

arch/x86/kernel/apic/x2apic_uv_x.c

+1 −3
Original line number Diff line number Diff line
@@ -891,8 +891,6 @@ void __init uv_system_init(void) 
	}

	pr_info("UV: Found %s hub\n", hub);



	/* We now only need to map the MMRs on UV1 */

	if (is_uv1_hub())

	map_low_mmrs();



	m_n_config.v = uv_read_local_mmr(UVH_RH_GAM_CONFIG_MMR );

arch/x86/kernel/tsc_msr.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ unsigned long try_msr_calibrate_tsc(void) 


	if (freq_desc_tables[cpu_index].msr_plat) {

		rdmsr(MSR_PLATFORM_INFO, lo, hi);

		ratio = (lo >> 8) & 0x1f;

		ratio = (lo >> 8) & 0xff;

	} else {

		rdmsr(MSR_IA32_PERF_STATUS, lo, hi);

		ratio = (hi >> 8) & 0x1f;