summaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/ioremap.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-08-27 02:17:51 +0200
committerH. Peter Anvin <hpa@zytor.com>2009-08-27 02:24:28 +0200
commitb855192c08fcb14adbc5d3a7cab182022d433cca (patch)
tree3a10cafbfbf98cafacf667eb218c71300b351bfa /arch/x86/mm/ioremap.c
parentx86, pat: Sanity check remap_pfn_range for RAM region (diff)
parentx86: Fix an incorrect argument of reserve_bootmem() (diff)
downloadlinux-b855192c08fcb14adbc5d3a7cab182022d433cca.tar.xz
linux-b855192c08fcb14adbc5d3a7cab182022d433cca.zip
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>
Diffstat (limited to 'arch/x86/mm/ioremap.c')
-rw-r--r--arch/x86/mm/ioremap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index aeaea8c5b2f4..2a76eba9da21 100644
--- a/arch/x86/mm/ioremap.c
+++ b/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,