[Xen-changelog] Fix DOM0_PHYSINFO to return correct value for total

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 8be7026371836fbeca738826391649cd00a2b947
# Parent  b4b12c9f120083417d8732b6de041cdded0d87dc
Fix DOM0_PHYSINFO to return correct value for total
system memory.

Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r b4b12c9f1200 -r 8be702637183 xen/arch/x86/dom0_ops.c
--- a/xen/arch/x86/dom0_ops.c   Wed Oct  5 12:54:36 2005
+++ b/xen/arch/x86/dom0_ops.c   Wed Oct  5 13:06:23 2005
@@ -186,7 +186,7 @@
         pi->sockets_per_node = 
             num_online_cpus() / (pi->threads_per_core * pi->cores_per_socket);
         pi->nr_nodes         = 1;
-        pi->total_pages      = max_page;
+        pi->total_pages      = total_pages;
         pi->free_pages       = avail_domheap_pages();
         pi->cpu_khz          = cpu_khz;
         memset(pi->hw_cap, 0, sizeof(pi->hw_cap));
diff -r b4b12c9f1200 -r 8be702637183 xen/arch/x86/mm.c
--- a/xen/arch/x86/mm.c Wed Oct  5 12:54:36 2005
+++ b/xen/arch/x86/mm.c Wed Oct  5 13:06:23 2005
@@ -147,6 +147,7 @@
 /* Frame table and its size in pages. */
 struct pfn_info *frame_table;
 unsigned long max_page;
+unsigned long total_pages;
 
 void __init init_frametable(void)
 {
diff -r b4b12c9f1200 -r 8be702637183 xen/arch/x86/setup.c
--- a/xen/arch/x86/setup.c      Wed Oct  5 12:54:36 2005
+++ b/xen/arch/x86/setup.c      Wed Oct  5 13:06:23 2005
@@ -418,6 +418,7 @@
     printk("System RAM: %luMB (%lukB)\n", 
            nr_pages >> (20 - PAGE_SHIFT),
            nr_pages << (PAGE_SHIFT - 10));
+    total_pages = nr_pages;
 
     init_frametable();
 
diff -r b4b12c9f1200 -r 8be702637183 xen/include/asm-x86/mm.h
--- a/xen/include/asm-x86/mm.h  Wed Oct  5 12:54:36 2005
+++ b/xen/include/asm-x86/mm.h  Wed Oct  5 13:06:23 2005
@@ -156,6 +156,7 @@
 
 extern struct pfn_info *frame_table;
 extern unsigned long max_page;
+extern unsigned long total_pages;
 void init_frametable(void);
 
 int alloc_page_type(struct pfn_info *page, unsigned long type);

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog