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

Commit 9af00e66 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: Don't dump vmalloc addresses with show_data()"

parents 05cf0f39 625a6492
Loading
Loading
Loading
Loading
+5 −8
Original line number Diff line number Diff line
@@ -321,16 +321,13 @@ static void show_data(unsigned long addr, int nbytes, const char *name)
	u32	*p;

	/*
	 * don't attempt to dump non-kernel addresses or
	 * values that are probably just small negative numbers
	 * don't attempt to dump non-kernel addresses, values that are probably
	 * just small negative numbers, or vmalloc addresses that may point to
	 * memory-mapped peripherals
	 */
	if (addr < PAGE_OFFSET || addr > -256UL)
	if (addr < PAGE_OFFSET || addr > -256UL ||
	    is_vmalloc_addr((void *)addr))
		return;
	if (is_vmalloc_addr((void *)addr)) {
		struct vm_struct *area = find_vm_area((void *)addr);
		if (area && area->flags & VM_IOREMAP)
			return;
	}

	printk("\n%s: %#lx:\n", name, addr);