tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 3f86ba5d 01ec7167

+2 -4
+1 -3
arch/x86/kernel/apic/x2apic_uv_x.c
··· 891 891 } 892 892 pr_info("UV: Found %s hub\n", hub); 893 893 894 - /* We now only need to map the MMRs on UV1 */ 895 - if (is_uv1_hub()) 896 - map_low_mmrs(); 894 + map_low_mmrs(); 897 895 898 896 m_n_config.v = uv_read_local_mmr(UVH_RH_GAM_CONFIG_MMR ); 899 897 m_val = m_n_config.s.m_skt;
+1 -1
arch/x86/kernel/tsc_msr.c
··· 92 92 93 93 if (freq_desc_tables[cpu_index].msr_plat) { 94 94 rdmsr(MSR_PLATFORM_INFO, lo, hi); 95 - ratio = (lo >> 8) & 0x1f; 95 + ratio = (lo >> 8) & 0xff; 96 96 } else { 97 97 rdmsr(MSR_IA32_PERF_STATUS, lo, hi); 98 98 ratio = (hi >> 8) & 0x1f;