Merge branch 'x86/urgent' into x86/pat

Reason: Change to is_new_memtype_allowed() in x86/urgent

Resolved semantic conflicts in:

	 arch/x86/mm/pat.c
	 arch/x86/mm/ioremap.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

arch/x86/mm/ioremap.c

@@ -233,7 +233,8 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
 	}
 
 	if (prot_val != new_prot_val) {
-		if (!is_new_memtype_allowed(prot_val, new_prot_val)) {
+		if (!is_new_memtype_allowed(phys_addr, size,
+					    prot_val, new_prot_val)) {
 			printk(KERN_ERR
 		"ioremap error for 0x%llx-0x%llx, requested 0x%lx, got 0x%lx\n",
 				(unsigned long long)phys_addr,