Merge branch 'x86/urgent' into x86/platform, to resolve conflict

Ingo Molnar · Ingo Molnar · commit 3cd0b53553ce · 2016-05-05T09:56:10.000+02:00
Conflicts:
	arch/x86/kernel/apic/x2apic_uv_x.c

Signed-off-by: Ingo Molnar &lt;mingo@kernel.org&gt;
diff --git 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();

Original file line number	Diff line number	Diff line change
`@@ -1395,9 +1395,7 @@ void __init uv_system_init(void)`
`1395`	`1395`	`}`
`1396`	`1396`	`pr_info("UV: Found %s hub\n", hub);`
`1397`	`1397`
`1398`		`- /* We now only need to map the MMRs on UV1 */`
`1399`		`- if (is_uv1_hub())`
`1400`		`- map_low_mmrs();`
	`1398`	`+ map_low_mmrs();`
`1401`	`1399`
`1402`	`1400`	`uv_bios_init(); /* get uv_systab for decoding */`
`1403`	`1401`	`decode_uv_systab();`