From c8d64b73b36217918197019c9d0cdfd5fe80463f Mon Sep 17 00:00:00 2001
From: Jan Beulich <jbeulich@novell.com>
Date: Tue, 26 Sep 2006 10:52:31 +0200
Subject: [PATCH] --- yaml --- r: 35826 b: refs/heads/master c:
 caff0710ebf6f2c44cbd2b8b31fd6329148bed2e h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86_64/kernel/e820.c  | 2 +-
 trunk/arch/x86_64/kernel/setup.c | 7 ++++++-
 trunk/arch/x86_64/mm/init.c      | 6 ------
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 266485e6e485..bcf3a0a28ee4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44cc45267bbe7c64f7d85b074bd670b48b5abdfb
+refs/heads/master: caff0710ebf6f2c44cbd2b8b31fd6329148bed2e
diff --git a/trunk/arch/x86_64/kernel/e820.c b/trunk/arch/x86_64/kernel/e820.c
index d6d7f731f6f0..1362aad4f3aa 100644
--- a/trunk/arch/x86_64/kernel/e820.c
+++ b/trunk/arch/x86_64/kernel/e820.c
@@ -40,7 +40,7 @@ unsigned long end_pfn_map;
 /* 
  * Last pfn which the user wants to use.
  */
-unsigned long end_user_pfn = MAXMEM>>PAGE_SHIFT;  
+static unsigned long __initdata end_user_pfn = MAXMEM>>PAGE_SHIFT;
 
 extern struct resource code_resource, data_resource;
 
diff --git a/trunk/arch/x86_64/kernel/setup.c b/trunk/arch/x86_64/kernel/setup.c
index aab4bd66aa0d..ddc3b2d9a165 100644
--- a/trunk/arch/x86_64/kernel/setup.c
+++ b/trunk/arch/x86_64/kernel/setup.c
@@ -554,7 +554,7 @@ void __init setup_arch(char **cmdline_p)
 	 * we are rounding upwards:
 	 */
 	end_pfn = e820_end_of_ram();
-	num_physpages = end_pfn;		/* for pfn_valid */
+	num_physpages = end_pfn;
 
 	check_efer();
 
@@ -574,6 +574,11 @@ void __init setup_arch(char **cmdline_p)
 	acpi_boot_table_init();
 #endif
 
+	/* How many end-of-memory variables you have, grandma! */
+	max_low_pfn = end_pfn;
+	max_pfn = end_pfn;
+	high_memory = (void *)__va(end_pfn * PAGE_SIZE - 1) + 1;
+
 #ifdef CONFIG_ACPI_NUMA
 	/*
 	 * Parse SRAT to discover nodes.
diff --git a/trunk/arch/x86_64/mm/init.c b/trunk/arch/x86_64/mm/init.c
index d14fb2dfbfc4..d40134bd6399 100644
--- a/trunk/arch/x86_64/mm/init.c
+++ b/trunk/arch/x86_64/mm/init.c
@@ -597,12 +597,6 @@ void __init mem_init(void)
 
 	pci_iommu_alloc();
 
-	/* How many end-of-memory variables you have, grandma! */
-	max_low_pfn = end_pfn;
-	max_pfn = end_pfn;
-	num_physpages = end_pfn;
-	high_memory = (void *) __va(end_pfn * PAGE_SIZE);
-
 	/* clear the zero-page */
 	memset(empty_zero_page, 0, PAGE_SIZE);