|
@@ -90,13 +90,6 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
|
|
|
if (is_ISA_range(phys_addr, last_addr))
|
|
|
return (__force void __iomem *)phys_to_virt(phys_addr);
|
|
|
|
|
|
- /*
|
|
|
- * Check if the request spans more than any BAR in the iomem resource
|
|
|
- * tree.
|
|
|
- */
|
|
|
- WARN_ONCE(iomem_map_sanity_check(phys_addr, size),
|
|
|
- KERN_INFO "Info: mapping multiple BARs. Your kernel is fine.");
|
|
|
-
|
|
|
/*
|
|
|
* Don't allow anybody to remap normal RAM that we're using..
|
|
|
*/
|
|
@@ -170,6 +163,13 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
|
|
|
ret_addr = (void __iomem *) (vaddr + offset);
|
|
|
mmiotrace_ioremap(unaligned_phys_addr, unaligned_size, ret_addr);
|
|
|
|
|
|
+ /*
|
|
|
+ * Check if the request spans more than any BAR in the iomem resource
|
|
|
+ * tree.
|
|
|
+ */
|
|
|
+ WARN_ONCE(iomem_map_sanity_check(unaligned_phys_addr, unaligned_size),
|
|
|
+ KERN_INFO "Info: mapping multiple BARs. Your kernel is fine.");
|
|
|
+
|
|
|
return ret_addr;
|
|
|
err_free_area:
|
|
|
free_vm_area(area);
|