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

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

resource: Set type when reserving new regions 



Set resource structs inserted by __reserve_region_with_split() to have the
correct type.  Setting the type doesn't fix any functional problem but
makes %pR on the resource work better.

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

kernel/resource.c

+3 −2
Original line number Diff line number Diff line
@@ -1022,6 +1022,7 @@ static void __init __reserve_region_with_split(struct resource *root, 
	struct resource *conflict;

	struct resource *res = alloc_resource(GFP_ATOMIC);

	struct resource *next_res = NULL;

	int type = resource_type(root);



	if (!res)

		return;
@@ -1029,7 +1030,7 @@ static void __init __reserve_region_with_split(struct resource *root, 
	res->name = name;

	res->start = start;

	res->end = end;

	res->flags = IORESOURCE_BUSY;

	res->flags = type | IORESOURCE_BUSY;

	res->desc = IORES_DESC_NONE;



	while (1) {
@@ -1064,7 +1065,7 @@ static void __init __reserve_region_with_split(struct resource *root, 
				next_res->name = name;

				next_res->start = conflict->end + 1;

				next_res->end = end;

				next_res->flags = IORESOURCE_BUSY;

				next_res->flags = type | IORESOURCE_BUSY;

				next_res->desc = IORES_DESC_NONE;

			}

		} else {