diff -rN -u -p old-xen-64-4/xen/arch/x86/mm.c new-xen-64-4/xen/arch/x86/mm.c --- old-xen-64-4/xen/arch/x86/mm.c 2005-05-31 16:15:06.000000000 +0000 +++ new-xen-64-4/xen/arch/x86/mm.c 2005-05-31 19:06:58.000000000 +0000 @@ -988,8 +988,8 @@ static int mod_l1_entry(l1_pgentry_t *pl { if ( unlikely(l1e_get_flags(nl1e) & L1_DISALLOW_MASK) ) { - MEM_LOG("Bad L1 type settings %" PRIpte "\n", - (l1e_get_value(nl1e) & L1_DISALLOW_MASK)); + MEM_LOG("Bad L1 type settings %08x\n", + (l1e_get_flags(nl1e) & L1_DISALLOW_MASK)); return 0; } @@ -1049,8 +1049,8 @@ static int mod_l2_entry(l2_pgentry_t *pl { if ( unlikely(l2e_get_flags(nl2e) & L2_DISALLOW_MASK) ) { - MEM_LOG("Bad L2 type settings %" PRIpte "\n", - (l2e_get_value(nl2e) & L2_DISALLOW_MASK)); + MEM_LOG("Bad L2 type settings %08x\n", + (l2e_get_flags(nl2e) & L2_DISALLOW_MASK)); return 0; } @@ -1104,8 +1104,8 @@ static int mod_l3_entry(l3_pgentry_t *pl { if ( unlikely(l3e_get_flags(nl3e) & L3_DISALLOW_MASK) ) { - MEM_LOG("Bad L3 type settings %" PRIpte "", - (u64)(l3e_get_value(nl3e) & L3_DISALLOW_MASK)); + MEM_LOG("Bad L3 type settings %08x\n", + (l3e_get_flags(nl3e) & L3_DISALLOW_MASK)); return 0; } @@ -1161,8 +1161,8 @@ static int mod_l4_entry(l4_pgentry_t *pl { if ( unlikely(l4e_get_flags(nl4e) & L4_DISALLOW_MASK) ) { - MEM_LOG("Bad L4 type settings %lx", - l4e_get_value(nl4e) & L4_DISALLOW_MASK); + MEM_LOG("Bad L4 type settings %08x", + l4e_get_flags(nl4e) & L4_DISALLOW_MASK); return 0; }