Documentation: fsl-quadspi: Add fsl,ls1043a-qspi compatible string

[cascardo/linux.git] / mm / kmemleak.c

diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index 25c0ad3..e642992 100644 (file)
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -276,7 +276,7 @@ static void kmemleak_disable(void);
  * Print a warning and dump the stack trace.
  */
 #define kmemleak_warn(x...)    do {            \
-       pr_warning(x);                          \
+       pr_warn(x);                             \
        dump_stack();                           \
        kmemleak_warning = 1;                   \
 } while (0)
@@ -543,7 +543,7 @@ static struct kmemleak_object *create_object(unsigned long ptr, size_t size,
 
        object = kmem_cache_alloc(object_cache, gfp_kmemleak_mask(gfp));
        if (!object) {
-               pr_warning("Cannot allocate a kmemleak_object structure\n");
+               pr_warn("Cannot allocate a kmemleak_object structure\n");
                kmemleak_disable();
                return NULL;
        }
@@ -596,8 +596,7 @@ static struct kmemleak_object *create_object(unsigned long ptr, size_t size,
                else if (parent->pointer + parent->size <= ptr)
                        link = &parent->rb_node.rb_right;
                else {
-                       kmemleak_stop("Cannot insert 0x%lx into the object "
-                                     "search tree (overlaps existing)\n",
+                       kmemleak_stop("Cannot insert 0x%lx into the object search tree (overlaps existing)\n",
                                      ptr);
                        /*
                         * No need for parent->lock here since "parent" cannot
@@ -670,8 +669,8 @@ static void delete_object_part(unsigned long ptr, size_t size)
        object = find_and_remove_object(ptr, 1);
        if (!object) {
 #ifdef DEBUG
-               kmemleak_warn("Partially freeing unknown object at 0x%08lx "
-                             "(size %zu)\n", ptr, size);
+               kmemleak_warn("Partially freeing unknown object at 0x%08lx (size %zu)\n",
+                             ptr, size);
 #endif
                return;
        }
@@ -717,8 +716,8 @@ static void paint_ptr(unsigned long ptr, int color)
 
        object = find_and_get_object(ptr, 0);
        if (!object) {
-               kmemleak_warn("Trying to color unknown object "
-                             "at 0x%08lx as %s\n", ptr,
+               kmemleak_warn("Trying to color unknown object at 0x%08lx as %s\n",
+                             ptr,
                              (color == KMEMLEAK_GREY) ? "Grey" :
                              (color == KMEMLEAK_BLACK) ? "Black" : "Unknown");
                return;
@@ -764,7 +763,7 @@ static void add_scan_area(unsigned long ptr, size_t size, gfp_t gfp)
 
        area = kmem_cache_alloc(scan_area_cache, gfp_kmemleak_mask(gfp));
        if (!area) {
-               pr_warning("Cannot allocate a scan area\n");
+               pr_warn("Cannot allocate a scan area\n");
                goto out;
        }
 
@@ -1463,8 +1462,8 @@ static void kmemleak_scan(void)
        if (new_leaks) {
                kmemleak_found_leaks = true;
 
-               pr_info("%d new suspected memory leaks (see "
-                       "/sys/kernel/debug/kmemleak)\n", new_leaks);
+               pr_info("%d new suspected memory leaks (see /sys/kernel/debug/kmemleak)\n",
+                       new_leaks);
        }
 
 }
@@ -1515,7 +1514,7 @@ static void start_scan_thread(void)
                return;
        scan_thread = kthread_run(kmemleak_scan_thread, NULL, "kmemleak");
        if (IS_ERR(scan_thread)) {
-               pr_warning("Failed to create the scan thread\n");
+               pr_warn("Failed to create the scan thread\n");
                scan_thread = NULL;
        }
 }
@@ -1795,8 +1794,7 @@ static void kmemleak_do_cleanup(struct work_struct *work)
        if (!kmemleak_found_leaks)
                __kmemleak_do_cleanup();
        else
-               pr_info("Kmemleak disabled without freeing internal data. "
-                       "Reclaim the memory with \"echo clear > /sys/kernel/debug/kmemleak\"\n");
+               pr_info("Kmemleak disabled without freeing internal data. Reclaim the memory with \"echo clear > /sys/kernel/debug/kmemleak\".\n");
 }
 
 static DECLARE_WORK(cleanup_work, kmemleak_do_cleanup);
@@ -1874,8 +1872,8 @@ void __init kmemleak_init(void)
        scan_area_cache = KMEM_CACHE(kmemleak_scan_area, SLAB_NOLEAKTRACE);
 
        if (crt_early_log > ARRAY_SIZE(early_log))
-               pr_warning("Early log buffer exceeded (%d), please increase "
-                          "DEBUG_KMEMLEAK_EARLY_LOG_SIZE\n", crt_early_log);
+               pr_warn("Early log buffer exceeded (%d), please increase DEBUG_KMEMLEAK_EARLY_LOG_SIZE\n",
+                       crt_early_log);
 
        /* the kernel is still in UP mode, so disabling the IRQs is enough */
        local_irq_save(flags);
@@ -1960,7 +1958,7 @@ static int __init kmemleak_late_init(void)
        dentry = debugfs_create_file("kmemleak", S_IRUGO, NULL, NULL,
                                     &kmemleak_fops);
        if (!dentry)
-               pr_warning("Failed to create the debugfs kmemleak file\n");
+               pr_warn("Failed to create the debugfs kmemleak file\n");
        mutex_lock(&scan_mutex);
        start_scan_thread();
        mutex_unlock(&scan_mutex);