From patchwork Sun Feb 14 20:31:01 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: 79317
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 o1EKWLv1006629
	for <patchwork-pci@patchwork.kernel.org>;
	Sun, 14 Feb 2010 20:32:21 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753210Ab0BNUcU (ORCPT
	<rfc822;patchwork-pci@patchwork.kernel.org>);
	Sun, 14 Feb 2010 15:32:20 -0500
Received: from hera.kernel.org ([140.211.167.34]:43504 "EHLO hera.kernel.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753168Ab0BNUcT (ORCPT <rfc822;linux-pci@vger.kernel.org>);
	Sun, 14 Feb 2010 15:32:19 -0500
Received: from [192.168.101.9] (adsl-75-36-248-242.dsl.pltn13.sbcglobal.net
	[75.36.248.242]) (authenticated bits=0)
	by hera.kernel.org (8.14.3/8.14.3) with ESMTP id o1EKVj04007744
	(version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256
	verify=NO); Sun, 14 Feb 2010 20:31:50 GMT
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.95.2 at hera.kernel.org
Message-ID: <4B785D85.3000408@kernel.org>
Date: Sun, 14 Feb 2010 12:31:01 -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: Stephen Rothwell <sfr@canb.auug.org.au>
CC: Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>,
	"H. Peter Anvin" <hpa@zytor.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Jesse Barnes <jbarnes@virtuousgeek.org>,
	Christoph Lameter <cl@linux-foundation.org>,
	linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org
Subject: Re: [PATCH 16/35] x86: make 64 bit use early_res instead of bootmem
	before slab
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>
In-Reply-To: <20100215010833.15f9e09a.sfr@canb.auug.org.au>
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]);
	Sun, 14 Feb 2010 20:32:21 +0000 (UTC)


Index: linux-2.6/mm/page_alloc.c
===================================================================
--- linux-2.6.orig/mm/page_alloc.c
+++ linux-2.6/mm/page_alloc.c
@@ -3456,6 +3456,7 @@ int __init add_from_early_node_map(struc
 	return nr_range;
 }
 
+#ifdef CONFIG_NO_BOOTMEM
 void * __init __alloc_memory_core_early(int nid, u64 size, u64 align,
 					u64 goal, u64 limit)
 {
@@ -3492,6 +3493,7 @@ void * __init __alloc_memory_core_early(
 
 	return NULL;
 }
+#endif
 
 
 void __init work_with_active_regions(int nid, work_fn_t work_fn, void *data)