From: David Vrabel <david.vrabel@citrix.com>
Date: Tue, 9 Oct 2012 11:46:27 +0000 (+0100)
Subject: trace: rename trace_hypercall() to __trace_hypercall_entry()
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~7779
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8590f0801e5f739f416b129c88e360ebb6974921;p=xen.git

trace: rename trace_hypercall() to __trace_hypercall_entry()

Tracing functions that don't check tb_init_done are (by convention)
prefixed with __.

Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Committed-by: Keir Fraser <keir@xen.org>
---

diff --git a/xen/arch/x86/trace.c b/xen/arch/x86/trace.c
index 982ca88945..b1804a497d 100644
--- a/xen/arch/x86/trace.c
+++ b/xen/arch/x86/trace.c
@@ -6,7 +6,7 @@
 #include <xen/sched.h>
 #include <xen/trace.h>
 
-void trace_hypercall(void)
+void __trace_hypercall_entry(void)
 {
     struct cpu_user_regs *regs = guest_cpu_user_regs();
     unsigned long args[6];
diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S
index 2f606ab925..e6b52f345e 100644
--- a/xen/arch/x86/x86_64/compat/entry.S
+++ b/xen/arch/x86/x86_64/compat/entry.S
@@ -59,8 +59,8 @@ UNLIKELY_END(msi_check)
 #endif
         cmpb  $0,tb_init_done(%rip)
 UNLIKELY_START(ne, compat_trace)
-        call  trace_hypercall
-        /* Now restore all the registers that trace_hypercall clobbered */
+        call  __trace_hypercall_entry
+        /* Restore the registers that __trace_hypercall_entry clobbered. */
         movl  UREGS_rax+SHADOW_BYTES(%rsp),%eax   /* Hypercall #  */
         movl  UREGS_rbx+SHADOW_BYTES(%rsp),%edi   /* Arg 1        */
         movl  UREGS_rcx+SHADOW_BYTES(%rsp),%esi   /* Arg 2        */
diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S
index 74a40758b2..ffb9314f40 100644
--- a/xen/arch/x86/x86_64/entry.S
+++ b/xen/arch/x86/x86_64/entry.S
@@ -159,8 +159,8 @@ ENTRY(syscall_enter)
 #endif
         cmpb  $0,tb_init_done(%rip)
 UNLIKELY_START(ne, trace)
-        call  trace_hypercall
-        /* Now restore all the registers that trace_hypercall clobbered */
+        call  __trace_hypercall_entry
+        /* Restore the registers that __trace_hypercall_entry clobbered. */
         movq  UREGS_rax+SHADOW_BYTES(%rsp),%rax   /* Hypercall #  */
         movq  UREGS_rdi+SHADOW_BYTES(%rsp),%rdi   /* Arg 1        */
         movq  UREGS_rsi+SHADOW_BYTES(%rsp),%rsi   /* Arg 2        */