diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-05-05 09:56:10 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-05-05 09:56:10 +0200 |
| commit | 3cd0b53553ce28da6fc828c601041c974e1c4dde (patch) | |
| tree | eb05932753a4afb9d3c82949ef056085f79be1b5 /arch | |
| parent | x86/platform/UV: Fix incorrect nodes and pnodes for cpuless and memoryless nodes (diff) | |
| parent | x86/platform/UV: Bring back the call to map_low_mmrs in uv_system_init (diff) | |
| download | linux-3cd0b53553ce28da6fc828c601041c974e1c4dde.tar.xz linux-3cd0b53553ce28da6fc828c601041c974e1c4dde.zip | |
Merge branch 'x86/urgent' into x86/platform, to resolve conflict
Conflicts:
arch/x86/kernel/apic/x2apic_uv_x.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/apic/x2apic_uv_x.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index aa6de8bad360..29003154fafd 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -1395,9 +1395,7 @@ 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(); + map_low_mmrs(); uv_bios_init(); /* get uv_systab for decoding */ decode_uv_systab(); |