diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2011-07-19 08:04:35 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-07-19 08:04:35 -0500 |
commit | 03ff09580ef6cbc4a893b6e3e6bbff33180ec70a (patch) | |
tree | e1133482f365abf9103e91538cc0e8e29806abe9 /trace-events | |
parent | b4dabf9587d8e1d5d5edc6d3326021e390b9a532 (diff) | |
parent | 25a118130fde0d20b0f5a223642849b392b2f2ee (diff) |
Merge remote-tracking branch 'agraf/xen-next' into staging
Diffstat (limited to 'trace-events')
-rw-r--r-- | trace-events | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/trace-events b/trace-events index 765a15ed77..ad11b09c0a 100644 --- a/trace-events +++ b/trace-events @@ -410,9 +410,9 @@ disable xen_ram_alloc(unsigned long ram_addr, unsigned long size) "requested: %# disable xen_client_set_memory(uint64_t start_addr, unsigned long size, unsigned long phys_offset, bool log_dirty) "%#"PRIx64" size %#lx, offset %#lx, log_dirty %i" # xen-mapcache.c -disable qemu_map_cache(uint64_t phys_addr) "want %#"PRIx64"" -disable qemu_remap_bucket(uint64_t index) "index %#"PRIx64"" -disable qemu_map_cache_return(void* ptr) "%p" +disable xen_map_cache(uint64_t phys_addr) "want %#"PRIx64"" +disable xen_remap_bucket(uint64_t index) "index %#"PRIx64"" +disable xen_map_cache_return(void* ptr) "%p" disable xen_map_block(uint64_t phys_addr, uint64_t size) "%#"PRIx64", size %#"PRIx64"" disable xen_unmap_block(void* addr, unsigned long size) "%p, size %#lx" |