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
them.

Signed-off-by: Alex Thorlton <athorl...@sgi.com>
Acked-by: Mike Travis <tra...@sgi.com>
Acked-by: Russ Anderson <r...@sgi.com>
Cc: Matt Fleming <matt.flem...@intel.com>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: Ingo Molnar <mi...@redhat.com>
Cc: "H. Peter Anvin" <h...@zytor.com>
Cc: Hedi Berriche <h...@sgi.com>
Cc: Dimitri Sivanich <sivan...@sgi.com>
Cc: x...@kernel.org
Cc: linux-...@vger.kernel.org

---
 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)
                return;
        }
        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;
-- 
1.8.5.6

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

Reply via email to