From patchwork Tue Mar  2 02:48:52 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Yinghai Lu <yinghai@kernel.org>
X-Patchwork-Id: 83115
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o222oaQp013655
	for <patchwork-pci@patchwork.kernel.org>; Tue, 2 Mar 2010 02:50:37 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753248Ab0CBCuM (ORCPT
	<rfc822;patchwork-pci@patchwork.kernel.org>);
	Mon, 1 Mar 2010 21:50:12 -0500
Received: from hera.kernel.org ([140.211.167.34]:49888 "EHLO hera.kernel.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753048Ab0CBCuL (ORCPT <rfc822;linux-pci@vger.kernel.org>);
	Mon, 1 Mar 2010 21:50:11 -0500
Received: from [10.6.76.26] (sca-ea-fw-1.Sun.COM [192.18.43.225])
	(authenticated bits=0)
	by hera.kernel.org (8.14.3/8.14.3) with ESMTP id o222nc4e020357
	(version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256
	verify=NO); Tue, 2 Mar 2010 02:49:42 GMT
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.95.2 at hera.kernel.org
Message-ID: <4B8C7C94.7070000@kernel.org>
Date: Mon, 01 Mar 2010 18:48:52 -0800
From: Yinghai Lu <yinghai@kernel.org>
User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US;
	rv:1.9.1.5) Gecko/20091130 SUSE/3.0.0-1.1.1 Thunderbird/3.0
MIME-Version: 1.0
To: Ingo Molnar <mingo@elte.hu>, "H. Peter Anvin" <hpa@zytor.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Andrew Morton <akpm@linux-foundation.org>
CC: Peter Zijlstra <peterz@infradead.org>, Tejun Heo <tj@kernel.org>,
	Christoph Lameter <cl@linux-foundation.org>,
	Stephen Rothwell <sfr@canb.auug.org.au>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Jesse Barnes <jbarnes@virtuousgeek.org>, linux-kernel@vger.kernel.org,
	linux-pci@vger.kernel.org, Pekka Enberg <penberg@cs.helsinki.fi>
Subject: [PATCH] early_res: need to save name aside with free_early_partial
References: <1265793639-15071-1-git-send-email-yinghai@kernel.org>	
	<1265793639-15071-17-git-send-email-yinghai@kernel.org>	
	<20100215010833.15f9e09a.sfr@canb.auug.org.au>	
	<4B7B4378.1070206@kernel.org>
	<1267052387.12790.10.camel@laptop> <4B85B65E.503@kernel.org>
	<4B85B724.9050304@kernel.org> <4B85DB79.4010708@kernel.org>
	<4B85E245.5030001@kernel.org>
In-Reply-To: <4B85E245.5030001@kernel.org>
Sender: linux-pci-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-pci.vger.kernel.org>
X-Mailing-List: linux-pci@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Tue, 02 Mar 2010 02:50:37 +0000 (UTC)


Index: linux-2.6/kernel/early_res.c
===================================================================
--- linux-2.6.orig/kernel/early_res.c
+++ linux-2.6/kernel/early_res.c
@@ -79,9 +79,16 @@ static void __init drop_range_partial(in
 		/* make head segment */
 		early_res[i].end = common_start;
 		if (old_end > common_end) {
+			char name[15];
+
+			/*
+			 * Save name aside, in reserve_early_ have allocated
+			 * and new early_res array because auto double
+			 */
+			strncpy(name, early_res[i].name,
+					 sizeof(early_res[i].name) - 1);
 			/* add another for left over on tail */
-			reserve_early_without_check(common_end, old_end,
-					 early_res[i].name);
+			reserve_early_without_check(common_end, old_end, name);
 		}
 		return;
 	} else {