From patchwork Tue May 19 05:20:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Kerr X-Patchwork-Id: 473725 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 562301400A0 for ; Tue, 19 May 2015 15:20:23 +1000 (AEST) Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3EA751A05EA for ; Tue, 19 May 2015 15:20:23 +1000 (AEST) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from ozlabs.org (ozlabs.org [103.22.144.67]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id E637B1A0017 for ; Tue, 19 May 2015 15:20:19 +1000 (AEST) Received: by ozlabs.org (Postfix, from userid 1023) id CE473140D4F; Tue, 19 May 2015 15:20:19 +1000 (AEST) MIME-Version: 1.0 Message-Id: <1432012815.74537.230453291086.1.gpush@pablo> In-Reply-To: <1432012815.74155.190719829775.0.gpush@pablo> To: skiboot@lists.ozlabs.org From: Jeremy Kerr Date: Tue, 19 May 2015 13:20:15 +0800 Subject: [Skiboot] [PATCH 1/7] core: Rename mem_region->mem_node to ->node X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" We'll want to store non-memory nodes in this pointer too. Signed-off-by: Jeremy Kerr --- core/mem_region.c | 10 +++++----- include/mem_region.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/mem_region.c b/core/mem_region.c index f387f37..4f73776 100644 --- a/core/mem_region.c +++ b/core/mem_region.c @@ -595,7 +595,7 @@ bool mem_check(const struct mem_region *region) static struct mem_region *new_region(const char *name, uint64_t start, uint64_t len, - struct dt_node *mem_node, + struct dt_node *node, enum mem_region_type type) { struct mem_region *region; @@ -607,7 +607,7 @@ static struct mem_region *new_region(const char *name, region->name = name; region->start = start; region->len = len; - region->mem_node = mem_node; + region->node = node; region->type = type; region->free_list.n.next = NULL; init_lock(®ion->free_list_lock); @@ -624,7 +624,7 @@ static struct mem_region *split_region(struct mem_region *head, uint64_t end = head->start + head->len; tail = new_region(head->name, split_at, end - split_at, - head->mem_node, type); + head->node, type); /* Original region becomes head. */ if (tail) head->len -= tail->len; @@ -747,9 +747,9 @@ restart: /* First pass, only match node local regions */ if (use_local) { - if (!region->mem_node) + if (!region->node) continue; - prop = dt_find_property(region->mem_node, "ibm,chip-id"); + prop = dt_find_property(region->node, "ibm,chip-id"); ids = (const __be32 *)prop->prop; if (!matches_chip_id(ids, prop->len/sizeof(u32), chip_id)) diff --git a/include/mem_region.h b/include/mem_region.h index e5cf0f6..fefd6ba 100644 --- a/include/mem_region.h +++ b/include/mem_region.h @@ -40,7 +40,7 @@ struct mem_region { struct list_node list; const char *name; uint64_t start, len; - struct dt_node *mem_node; + struct dt_node *node; enum mem_region_type type; struct list_head free_list; struct lock free_list_lock;