Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 756a025f authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

mm: coalesce split strings 



Kernel style prefers a single string over split strings when the string is
'user-visible'.

Miscellanea:

 - Add a missing newline
 - Realign arguments

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: Tejun Heo <tj@kernel.org>	[percpu]
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 598d8091

mm/dmapool.c

+4 −6
Original line number Diff line number Diff line
@@ -452,13 +452,11 @@ void dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t dma) 
			}

			spin_unlock_irqrestore(&pool->lock, flags);

			if (pool->dev)

				dev_err(pool->dev, "dma_pool_free %s, dma %Lx "

					"already free\n", pool->name,

					(unsigned long long)dma);

				dev_err(pool->dev, "dma_pool_free %s, dma %Lx already free\n",

					pool->name, (unsigned long long)dma);

			else

				printk(KERN_ERR "dma_pool_free %s, dma %Lx "

					"already free\n", pool->name,

					(unsigned long long)dma);

				printk(KERN_ERR "dma_pool_free %s, dma %Lx already free\n",

					pool->name, (unsigned long long)dma);

			return;

		}

	}

mm/huge_memory.c

+1 −2
Original line number Diff line number Diff line
@@ -168,8 +168,7 @@ static void set_recommended_min_free_kbytes(void) 


	if (recommended_min > min_free_kbytes) {

		if (user_min_free_kbytes >= 0)

			pr_info("raising min_free_kbytes from %d to %lu "

				"to help transparent hugepage allocations\n",

			pr_info("raising min_free_kbytes from %d to %lu to help transparent hugepage allocations\n",

				min_free_kbytes, recommended_min);



		min_free_kbytes = recommended_min;

mm/kasan/report.c

+2 −4
Original line number Diff line number Diff line
@@ -214,8 +214,7 @@ static void kasan_report_error(struct kasan_access_info *info) 
	 */

	kasan_disable_current();

	spin_lock_irqsave(&report_lock, flags);

	pr_err("================================="

		"=================================\n");

	pr_err("==================================================================\n");

	if (info->access_addr <

			kasan_shadow_to_mem((void *)KASAN_SHADOW_START)) {

		if ((unsigned long)info->access_addr < PAGE_SIZE)
@@ -236,8 +235,7 @@ static void kasan_report_error(struct kasan_access_info *info) 
		print_address_description(info);

		print_shadow_for_address(info->first_bad_addr);

	}

	pr_err("================================="

		"=================================\n");

	pr_err("==================================================================\n");

	add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);

	spin_unlock_irqrestore(&report_lock, flags);

	kasan_enable_current();

mm/kmemcheck.c

+1 −2
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ void kmemcheck_alloc_shadow(struct page *page, int order, gfp_t flags, int node) 
	shadow = alloc_pages_node(node, flags | __GFP_NOTRACK, order);

	if (!shadow) {

		if (printk_ratelimit())

			printk(KERN_ERR "kmemcheck: failed to allocate "

				"shadow bitmap\n");

			printk(KERN_ERR "kmemcheck: failed to allocate shadow bitmap\n");

		return;

	}

mm/kmemleak.c

+8 −10
Original line number Diff line number Diff line
@@ -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;
@@ -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);

	}



}
@@ -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);