All of lore.kernel.org
 help / color / mirror / Atom feed
From: Pekka Enberg <penberg@kernel.org>
To: x86@kernel.org
Cc: linux-kernel@vger.kernel.org, Pekka Enberg <penberg@kernel.org>,
	Tejun Heo <tj@kernel.org>, Yinghai Lu <yinghai@kernel.org>,
	"H. Peter Anvin" <hpa@linux.intel.com>,
	David Rientjes <rientjes@google.com>
Subject: [RFC/PATCH 3/7] x86, mm: Use max_pfn instead of highend_pfn
Date: Fri, 28 Oct 2011 17:23:17 +0300	[thread overview]
Message-ID: <1319811801-1725-3-git-send-email-penberg@kernel.org> (raw)
In-Reply-To: <1319811801-1725-1-git-send-email-penberg@kernel.org>

The 'highend_pfn' variable is always set to 'max_pfn' so just use the latter
directly.

Cc: Tejun Heo <tj@kernel.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: H. Peter Anvin <hpa@linux.intel.com>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
---
 arch/x86/mm/init_32.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 434c97d..6101894 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -54,7 +54,7 @@
 #include <asm/page_types.h>
 #include <asm/init.h>
 
-unsigned long highstart_pfn, highend_pfn;
+unsigned long highstart_pfn;
 
 static noinline int do_test_wp_bit(void);
 
@@ -647,14 +647,14 @@ void __init find_low_pfn_range(void)
 void __init initmem_init(void)
 {
 #ifdef CONFIG_HIGHMEM
-	highstart_pfn = highend_pfn = max_pfn;
+	highstart_pfn = max_pfn;
 	if (max_pfn > max_low_pfn)
 		highstart_pfn = max_low_pfn;
-	memblock_x86_register_active_regions(0, 0, highend_pfn);
+	memblock_x86_register_active_regions(0, 0, max_pfn);
 	sparse_memory_present_with_active_regions(0);
 	printk(KERN_NOTICE "%ldMB HIGHMEM available.\n",
-		pages_to_mb(highend_pfn - highstart_pfn));
-	num_physpages = highend_pfn;
+		pages_to_mb(max_pfn - highstart_pfn));
+	num_physpages = max_pfn;
 	high_memory = (void *) __va(highstart_pfn * PAGE_SIZE - 1) + 1;
 #else
 	memblock_x86_register_active_regions(0, 0, max_low_pfn);
@@ -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);
-- 
1.7.6.4


  parent reply	other threads:[~2011-10-28 14:23 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-28 14:23 [RFC/PATCH 1/7] x86, mm: Use MAX_DMA_PFN for ZONE_DMA on 32-bit Pekka Enberg
2011-10-28 14:23 ` [RFC/PATCH 2/7] x86, mm: Move zone init from paging_init() on 64-bit Pekka Enberg
2011-10-31 22:50   ` David Rientjes
2011-10-28 14:23 ` Pekka Enberg [this message]
2011-10-31 22:54   ` [RFC/PATCH 3/7] x86, mm: Use max_pfn instead of highend_pfn David Rientjes
2011-11-01  6:37     ` Pekka Enberg
2011-10-28 14:23 ` [RFC/PATCH 4/7] x86, mm: Wrap ZONE_DMA32 with CONFIG_ZONE_DMA32 Pekka Enberg
2011-10-31 22:52   ` David Rientjes
2011-10-31 23:01     ` Arun Sharma
2011-10-28 14:23 ` [RFC/PATCH 5/7] x86, mm: Use max_low_pfn for ZONE_NORMAL on 64-bit Pekka Enberg
2011-10-31 22:54   ` David Rientjes
2011-10-28 14:23 ` [RFC/PATCH 6/7] x86, mm: Prepare zone_sizes_init() for unification Pekka Enberg
2011-10-31 22:56   ` David Rientjes
2011-11-01  6:32     ` Pekka Enberg
2011-10-28 14:23 ` [RFC/PATCH 7/7] x86, mm: Unify zone_sizes_init() Pekka Enberg
2011-10-28 15:48   ` Tejun Heo
2011-10-31 18:30 ` [RFC/PATCH 1/7] x86, mm: Use MAX_DMA_PFN for ZONE_DMA on 32-bit Yinghai Lu
2011-10-31 22:50 ` David Rientjes

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1319811801-1725-3-git-send-email-penberg@kernel.org \
    --to=penberg@kernel.org \
    --cc=hpa@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rientjes@google.com \
    --cc=tj@kernel.org \
    --cc=x86@kernel.org \
    --cc=yinghai@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.