Merge tag 'usb-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[~andy/linux] / drivers / base / dma-contiguous.c

diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c
index 612afcc5a938f45549ed877ebd6c8ac697315fe3..0ca54421ce977b7f82055644a08d8ea0ae3ca406 100644 (file)
--- a/drivers/base/dma-contiguous.c
+++ b/drivers/base/dma-contiguous.c
@@ -57,8 +57,8 @@ struct cma *dma_contiguous_default_area;
  * Users, who want to set the size of global CMA area for their system
  * should use cma= kernel parameter.
  */
-static const unsigned long size_bytes = CMA_SIZE_MBYTES * SZ_1M;
-static long size_cmdline = -1;
+static const phys_addr_t size_bytes = CMA_SIZE_MBYTES * SZ_1M;
+static phys_addr_t size_cmdline = -1;
 
 static int __init early_cma(char *p)
 {
@@ -70,7 +70,7 @@ early_param("cma", early_cma);
 
 #ifdef CONFIG_CMA_SIZE_PERCENTAGE
 
-static unsigned long __init __maybe_unused cma_early_percent_memory(void)
+static phys_addr_t __init __maybe_unused cma_early_percent_memory(void)
 {
        struct memblock_region *reg;
        unsigned long total_pages = 0;
@@ -88,7 +88,7 @@ static unsigned long __init __maybe_unused cma_early_percent_memory(void)
 
 #else
 
-static inline __maybe_unused unsigned long cma_early_percent_memory(void)
+static inline __maybe_unused phys_addr_t cma_early_percent_memory(void)
 {
        return 0;
 }
@@ -106,7 +106,7 @@ static inline __maybe_unused unsigned long cma_early_percent_memory(void)
  */
 void __init dma_contiguous_reserve(phys_addr_t limit)
 {
-       unsigned long selected_size = 0;
+       phys_addr_t selected_size = 0;
 
        pr_debug("%s(limit %08lx)\n", __func__, (unsigned long)limit);
 
@@ -126,7 +126,7 @@ void __init dma_contiguous_reserve(phys_addr_t limit)
 
        if (selected_size) {
                pr_debug("%s: reserving %ld MiB for global area\n", __func__,
-                        selected_size / SZ_1M);
+                        (unsigned long)selected_size / SZ_1M);
 
                dma_declare_contiguous(NULL, selected_size, 0, limit);
        }
@@ -227,11 +227,11 @@ core_initcall(cma_init_reserved_areas);
  * called by board specific code when early allocator (memblock or bootmem)
  * is still activate.
  */
-int __init dma_declare_contiguous(struct device *dev, unsigned long size,
+int __init dma_declare_contiguous(struct device *dev, phys_addr_t size,
                                  phys_addr_t base, phys_addr_t limit)
 {
        struct cma_reserved *r = &cma_reserved[cma_reserved_count];
-       unsigned long alignment;
+       phys_addr_t alignment;
 
        pr_debug("%s(size %lx, base %08lx, limit %08lx)\n", __func__,
                 (unsigned long)size, (unsigned long)base,
@@ -268,10 +268,6 @@ int __init dma_declare_contiguous(struct device *dev, unsigned long size,
                if (!addr) {
                        base = -ENOMEM;
                        goto err;
-               } else if (addr + size > ~(unsigned long)0) {
-                       memblock_free(addr, size);
-                       base = -EINVAL;
-                       goto err;
                } else {
                        base = addr;
                }
@@ -285,14 +281,14 @@ int __init dma_declare_contiguous(struct device *dev, unsigned long size,
        r->size = size;
        r->dev = dev;
        cma_reserved_count++;
-       pr_info("CMA: reserved %ld MiB at %08lx\n", size / SZ_1M,
+       pr_info("CMA: reserved %ld MiB at %08lx\n", (unsigned long)size / SZ_1M,
                (unsigned long)base);
 
        /* Architecture specific contiguous memory fixup. */
        dma_contiguous_early_fixup(base, size);
        return 0;
 err:
-       pr_err("CMA: failed to reserve %ld MiB\n", size / SZ_1M);
+       pr_err("CMA: failed to reserve %ld MiB\n", (unsigned long)size / SZ_1M);
        return base;
 }