diff options
| author | Keir Fraser <keir@xen.org> | 2011-01-26 08:35:24 +0000 |
|---|---|---|
| committer | Keir Fraser <keir@xen.org> | 2011-01-26 08:35:24 +0000 |
| commit | 36d7b2d453e1aebaa76844613a24bde528c68b75 (patch) | |
| tree | 5963dae5ef4c6c05a75d29c0b53ddd46e6ca10d6 /xen/arch/x86/x86_64/entry.S | |
| parent | a5491716265f416f9278955f1443165065c85a1c (diff) | |
| download | xen-36d7b2d453e1aebaa76844613a24bde528c68b75.tar.gz xen-36d7b2d453e1aebaa76844613a24bde528c68b75.tar.bz2 xen-36d7b2d453e1aebaa76844613a24bde528c68b75.zip | |
x86: Do not pollute namespace with asm defns of PERFC_*.
This fixes the build with perfc=y.
Signed-off-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/arch/x86/x86_64/entry.S')
| -rw-r--r-- | xen/arch/x86/x86_64/entry.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index b30f2d0c13..a6c68220c8 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -161,7 +161,7 @@ UNLIKELY_START(ne, trace) #undef SHADOW_BYTES UNLIKELY_END(trace) leaq hypercall_table(%rip),%r10 - PERFC_INCR(PERFC_hypercalls, %rax, %rbx) + PERFC_INCR(hypercalls, %rax, %rbx) callq *(%r10,%rax,8) #ifndef NDEBUG /* Deliberately corrupt parameter regs used by this hypercall. */ @@ -464,7 +464,7 @@ handle_exception_saved: movl UREGS_entry_vector(%rsp),%eax leaq exception_table(%rip),%rdx GET_CURRENT(%rbx) - PERFC_INCR(PERFC_exceptions, %rax, %rbx) + PERFC_INCR(exceptions, %rax, %rbx) callq *(%rdx,%rax,8) testb $3,UREGS_cs(%rsp) jz restore_all_xen |