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

Commit e4c72966 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

resources: Clarify sanity check message 



The resource map sanity check message is a bit confusing.  Change it to be
more readable:

  -resource map sanity check conflict: 0xfed10000 0xfed15fff 0xfed10000 0xfed13fff pnp 00:01
  +resource sanity check: requesting [mem 0xfed10000-0xfed15fff], which spans more than pnp 00:01 [mem 0xfed10000-0xfed13fff]

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent d739a099

kernel/resource.c

+2 −5
Original line number Diff line number Diff line
@@ -1288,13 +1288,10 @@ int iomem_map_sanity_check(resource_size_t addr, unsigned long size) 
		if (p->flags & IORESOURCE_BUSY)

			continue;



		printk(KERN_WARNING "resource map sanity check conflict: "

		       "0x%llx 0x%llx 0x%llx 0x%llx %s\n",

		printk(KERN_WARNING "resource sanity check: requesting [mem %#010llx-%#010llx], which spans more than %s %pR\n",

		       (unsigned long long)addr,

		       (unsigned long long)(addr + size - 1),

		       (unsigned long long)p->start,

		       (unsigned long long)p->end,

		       p->name);

		       p->name, p);

		err = -1;

		break;

	}