From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752428AbdLEAlD (ORCPT ); Mon, 4 Dec 2017 19:41:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:33780 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752487AbdLEAk5 (ORCPT ); Mon, 4 Dec 2017 19:40:57 -0500 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BF3E42190A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=helgaas@kernel.org Subject: [PATCH v1 6/6] resource: Set type when reserving new regions From: Bjorn Helgaas Cc: Jason Cooper , Bartlomiej Zolnierkiewicz , Marc Zyngier , Benjamin Herrenschmidt , linux-kernel@vger.kernel.org, Ralf Baechle , Paul Mackerras , Michael Ellerman , Ivan Kokshaysky , Thomas Gleixner , Yinghai Lu , Matt Turner , Richard Henderson Date: Mon, 04 Dec 2017 18:40:53 -0600 Message-ID: <20171205004053.12535.68808.stgit@bhelgaas-glaptop.roam.corp.google.com> In-Reply-To: <20171205003525.12535.89924.stgit@bhelgaas-glaptop.roam.corp.google.com> References: <20171205003525.12535.89924.stgit@bhelgaas-glaptop.roam.corp.google.com> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bjorn Helgaas 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: Bjorn Helgaas --- kernel/resource.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/resource.c b/kernel/resource.c index ba3252f7c319..8c527d83ca76 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -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 {