[PATCH 2/2] Remove extra mapping code for UV MMRs

From: Alex Thorlton
Date: Mon Nov 16 2015 - 12:59:50 EST

These MMRs get mapped in correctly using the new EFI memmap scheme on
recent BIOSes, so we no longer need to set up these extra mappings for

Signed-off-by: Alex Thorlton <athorlton@xxxxxxx>
Acked-by: Mike Travis <travis@xxxxxxx>
Acked-by: Russ Anderson <rja@xxxxxxx>
Cc: Matt Fleming <matt.fleming@xxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Cc: Hedi Berriche <hedi@xxxxxxx>
Cc: Dimitri Sivanich <sivanich@xxxxxxx>
Cc: x86@xxxxxxxxxx
Cc: linux-efi@xxxxxxxxxxxxxxx

arch/x86/kernel/apic/x2apic_uv_x.c | 7 -------
1 file changed, 7 deletions(-)

diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index c8d9295..e8db45d 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -712,12 +712,6 @@ static __init void map_mmioh_high(int min_pnode, int max_pnode)

-static __init void map_low_mmrs(void)
- init_extra_mapping_uc(UV_GLOBAL_MMR32_BASE, UV_GLOBAL_MMR32_SIZE);
- init_extra_mapping_uc(UV_LOCAL_MMR_BASE, UV_LOCAL_MMR_SIZE);
static __init void uv_rtc_init(void)
long status;
@@ -890,7 +884,6 @@ void __init uv_system_init(void)
pr_info("UV: Found %s hub\n", hub);
- map_low_mmrs();

m_n_config.v = uv_read_local_mmr(UVH_RH_GAM_CONFIG_MMR );
m_val = m_n_config.s.m_skt;

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/