From patchwork Fri Aug 23 06:31:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tangchen X-Patchwork-Id: 2848554 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A7B8F9F239 for ; Fri, 23 Aug 2013 06:48:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D234F2013C for ; Fri, 23 Aug 2013 06:48:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CBBFE20116 for ; Fri, 23 Aug 2013 06:48:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754134Ab3HWGs2 (ORCPT ); Fri, 23 Aug 2013 02:48:28 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:29915 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1754739Ab3HWGs1 (ORCPT ); Fri, 23 Aug 2013 02:48:27 -0400 X-IronPort-AV: E=Sophos;i="4.89,939,1367942400"; d="scan'208";a="8280361" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 23 Aug 2013 14:29:36 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r7N6Wcn7009345; Fri, 23 Aug 2013 14:32:40 +0800 Received: from G08FNSTD090432.fnst.cn.fujitsu.com ([10.167.226.99]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013082314305005-889592 ; Fri, 23 Aug 2013 14:30:50 +0800 From: Tang Chen To: mingo@redhat.com, hpa@zytor.com, yinghai@kernel.org, penberg@kernel.org, jacob.shin@amd.com, tglx@linutronix.de, lenb@kernel.org, rjw@sisk.pl Cc: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, x86@kernel.org Subject: [PATCH 3/3] x86, mm: Move max_pfn_mapped definition to init.c. Date: Fri, 23 Aug 2013 14:31:20 +0800 Message-Id: <1377239480-32532-4-git-send-email-tangchen@cn.fujitsu.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1377239480-32532-1-git-send-email-tangchen@cn.fujitsu.com> References: <1377239480-32532-1-git-send-email-tangchen@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/08/23 14:30:50, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/08/23 14:30:52, Serialize complete at 2013/08/23 14:30:52 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-9.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP min_pfn_mapped is defined in init.c, we can also define max_pfn_mapped here. Signed-off-by: Tang Chen --- arch/x86/kernel/setup.c | 8 -------- arch/x86/mm/init.c | 9 +++++++++ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index f13df7b..382e20b 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -111,14 +111,6 @@ #include #include -/* - * max_pfn_mapped: highest direct mapped pfn - * - * The direct mapping only covers E820_RAM regions, so the ranges and gaps are - * represented by pfn_mapped - */ -unsigned long max_pfn_mapped; - #ifdef CONFIG_DMI RESERVE_BRK(dmi_alloc, 65536); #endif diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index a97749f..793204b 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -24,6 +24,15 @@ static unsigned long __initdata pgt_buf_start; static unsigned long __initdata pgt_buf_end; static unsigned long __initdata pgt_buf_top; +/* + * max_pfn_mapped: highest direct mapped pfn + * min_pfn_mapped: lowest direct mapped pfn + * + * The direct mapping only covers E820_RAM regions, so the ranges and gaps are + * represented by pfn_mapped + */ + +unsigned long max_pfn_mapped; static unsigned long min_pfn_mapped; static bool __initdata can_use_brk_pgt = true;