From: Trammell Hudson <thudson@newskysaw.eecs.northwestern.edu>
Date: Wed, 22 Oct 2008 16:43:44 +0000 (-0500)
Subject: Merge branch 'kitten' of ssh://sharedev@localhost/home/sharedev/palacios into kitten
X-Git-Tag: 1.0^2~4^2~3
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=c7a9fea1093d8000b547a394a90abe7dffc518da;hp=2c4ffdb498e1e6f61fdd00ee90a0282fd135aa9b;p=palacios.git

Merge branch 'kitten' of ssh://sharedev@localhost/home/sharedev/palacios into kitten
---

diff --git a/palacios/src/palacios/vmm_ctrl_regs.c b/palacios/src/palacios/vmm_ctrl_regs.c
index 94a8d85..a6301db 100644
--- a/palacios/src/palacios/vmm_ctrl_regs.c
+++ b/palacios/src/palacios/vmm_ctrl_regs.c
@@ -261,7 +261,7 @@ int v3_handle_cr3_write(struct guest_info * info) {
 		 *(uint_t*)shadow_cr3, *(uint_t*)guest_cr3);
       
 
-      cached = v3_cache_page_tables32(info, V3_PAddr((addr_t)CR3_TO_PDE32((void *)*(addr_t *)new_cr3)));
+      cached = v3_cache_page_tables32(info, (addr_t)V3_PAddr((void *)(addr_t)CR3_TO_PDE32((void *)*(addr_t *)new_cr3)));
 
       if (cached == -1) {
 	PrintError("CR3 Cache failed\n");