diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-05-05 03:56:10 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-05-05 03:56:10 -0400 |
| commit | 3cd0b53553ce28da6fc828c601041c974e1c4dde (patch) | |
| tree | eb05932753a4afb9d3c82949ef056085f79be1b5 | |
| parent | f68376fc9e6dc15a08e16f08c95e503f19ad8e34 (diff) | |
| parent | 08914f436bdd2ed60923f49cbc402307aba20fe4 (diff) | |
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>
| -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) | |||
| 1395 | } | 1395 | } |
| 1396 | pr_info("UV: Found %s hub\n", hub); | 1396 | pr_info("UV: Found %s hub\n", hub); |
| 1397 | 1397 | ||
| 1398 | /* We now only need to map the MMRs on UV1 */ | 1398 | map_low_mmrs(); |
| 1399 | if (is_uv1_hub()) | ||
| 1400 | map_low_mmrs(); | ||
| 1401 | 1399 | ||
| 1402 | uv_bios_init(); /* get uv_systab for decoding */ | 1400 | uv_bios_init(); /* get uv_systab for decoding */ |
| 1403 | decode_uv_systab(); | 1401 | decode_uv_systab(); |