Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932374AbbLBPHQ (ORCPT ); Wed, 2 Dec 2015 10:07:16 -0500 Received: from rs224.mailgun.us ([209.61.151.224]:43528 "EHLO rs224.mailgun.us" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753447AbbLBPHO (ORCPT ); Wed, 2 Dec 2015 10:07:14 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=variantweb.net; s=smtp; q=dns; h=Sender: From: To: Cc: Subject: Date: Message-Id; b=HIjVTuX+n4Gft7kcsI3xCdEFUDJLQF78iHlmpsDhGCH0VU8BYUXvPsqzOZz+nwlJmonjkB huQyhTlouAYSjcGjnANK1200LkEGIHCA7bQPV7LSjsX9tqdiurpmbpgh7j9bG2Wa8BPcO210 EWs0/uKymnzZvrLl/EuFmkFlMpRCQ= X-Mailgun-Sid: WyJmNDFlMyIsICJsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnIiwgIjlkYjc2Il0= From: Seth Jennings To: Greg Kroah-Hartman Cc: Seth Jennings , Andrew Banman , Andrew Morton , Russ Anderson , linux-kernel@vger.kernel.org Subject: [PATCH 1/3] drivers: memory: clean up section counting Date: Wed, 2 Dec 2015 09:06:59 -0600 Message-Id: <1449068821-9870-1-git-send-email-sjennings@variantweb.net> X-Mailer: git-send-email 2.5.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1628 Lines: 42 Right now, section_count is calculated in add_memory_block(). However, init_memory_block() increments section_count as well, which, at first, seems like it would lead to an off-by-one error. There is no harm done because add_memory_block() immediately overwrites the mem->section_count, but it is messy. This commit moves the increment out of the common init_memory_block() (called by both add_memory_block() and register_new_memory()) and adds it to register_new_memory(). Signed-off-by: Seth Jennings --- drivers/base/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/base/memory.c b/drivers/base/memory.c index 2804aed..ca2ce02 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c @@ -614,7 +614,6 @@ static int init_memory_block(struct memory_block **memory, base_memory_block_id(scn_nr) * sections_per_block; mem->end_section_nr = mem->start_section_nr + sections_per_block - 1; mem->state = state; - mem->section_count++; start_pfn = section_nr_to_pfn(mem->start_section_nr); mem->phys_device = arch_get_memory_phys_device(start_pfn); @@ -668,6 +667,7 @@ int register_new_memory(int nid, struct mem_section *section) ret = init_memory_block(&mem, section, MEM_OFFLINE); if (ret) goto out; + mem->section_count++; } if (mem->section_count == sections_per_block) -- 2.5.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/