[Xen-changelog] [xen-unstable] xentrace: fix t_info_pages calculation.

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Olaf Hering <olaf@xxxxxxxxx>
# Date 1301043393 0
# Node ID 67632e5cf652826572055640702e1f83fb660afa
# Parent  7743791e9068c67755641ae5502d733924f296a2
xentrace: fix t_info_pages calculation.

Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
---


diff -r 7743791e9068 -r 67632e5cf652 xen/common/trace.c
--- a/xen/common/trace.c        Thu Mar 24 13:35:58 2011 +0000
+++ b/xen/common/trace.c        Fri Mar 25 08:56:33 2011 +0000
@@ -29,6 +29,7 @@
 #include <xen/init.h>
 #include <xen/mm.h>
 #include <xen/percpu.h>
+#include <xen/pfn.h>
 #include <xen/cpu.h>
 #include <asm/atomic.h>
 #include <public/sysctl.h>
@@ -109,6 +110,7 @@
 {
     struct t_buf dummy;
     typeof(dummy.prod) size;
+    unsigned int t_info_words, t_info_bytes;
 
     /* force maximum value for an unsigned type */
     size = -1;
@@ -122,11 +124,9 @@
         pages = size;
     }
 
-    t_info_pages = num_online_cpus() * pages + t_info_first_offset;
-    t_info_pages *= sizeof(uint32_t);
-    t_info_pages /= PAGE_SIZE;
-    if ( t_info_pages % PAGE_SIZE )
-        t_info_pages++;
+    t_info_words = num_online_cpus() * pages + t_info_first_offset;
+    t_info_bytes = t_info_words * sizeof(uint32_t);
+    t_info_pages = PFN_UP(t_info_bytes);
     return pages;
 }
 

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