From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757510Ab1KRXYq (ORCPT ); Fri, 18 Nov 2011 18:24:46 -0500 Received: from terminus.zytor.com ([198.137.202.10]:53177 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753985Ab1KRXYo (ORCPT ); Fri, 18 Nov 2011 18:24:44 -0500 Date: Fri, 18 Nov 2011 15:24:21 -0800 From: tip-bot for Pekka Enberg Message-ID: Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com, yinghai@kernel.org, penberg@kernel.org, tj@kernel.org, tglx@linutronix.de, mingo@elte.hu Reply-To: mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, yinghai@kernel.org, penberg@kernel.org, tj@kernel.org, tglx@linutronix.de, mingo@elte.hu In-Reply-To: <1320155902-10424-3-git-send-email-penberg@kernel.org> References: <1320155902-10424-3-git-send-email-penberg@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86, mm: Use max_pfn instead of highend_pfn Git-Commit-ID: e4794640ca408acda18eb31b126f58a58803b9c9 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.6 (terminus.zytor.com [127.0.0.1]); Fri, 18 Nov 2011 15:24:35 -0800 (PST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: e4794640ca408acda18eb31b126f58a58803b9c9 Gitweb: http://git.kernel.org/tip/e4794640ca408acda18eb31b126f58a58803b9c9 Author: Pekka Enberg AuthorDate: Tue, 1 Nov 2011 15:58:18 +0200 Committer: Ingo Molnar CommitDate: Fri, 11 Nov 2011 10:22:45 +0100 x86, mm: Use max_pfn instead of highend_pfn The 'highend_pfn' variable is always set to 'max_pfn' so just use the latter directly. Acked-by: Tejun Heo Acked-by: Yinghai Lu Signed-off-by: Pekka Enberg Link: http://lkml.kernel.org/r/1320155902-10424-3-git-send-email-penberg@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/mm/init_32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index 434c97d..5ac0118 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c @@ -683,7 +683,7 @@ static void __init zone_sizes_init(void) #endif max_zone_pfns[ZONE_NORMAL] = max_low_pfn; #ifdef CONFIG_HIGHMEM - max_zone_pfns[ZONE_HIGHMEM] = highend_pfn; + max_zone_pfns[ZONE_HIGHMEM] = max_pfn; #endif free_area_init_nodes(max_zone_pfns);