[Xen-changelog] [xen-4.0-testing] x86: Do not pollute namespace with asm defns of PERFC_*.

["Xen patchbot-4.0-testing" <patchbot@xxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1296032477 0
# Node ID 8fa76bc21363d7dbc3fbc7d0333e6668a5953ebe
# Parent  6531202cdf1fa9a57674dcf20f522a844f483926
x86: Do not pollute namespace with asm defns of PERFC_*.

This fixes the build with perfc=y.

Signed-off-by: Keir Fraser <keir@xxxxxxx>
xen-unstable changeset:   22814:b9017fdaad4d
xen-unstable date:        Wed Jan 26 08:35:24 2011 +0000
---
 xen/arch/x86/x86_32/asm-offsets.c      |    4 ++--
 xen/arch/x86/x86_32/entry.S            |    4 ++--
 xen/arch/x86/x86_64/asm-offsets.c      |    4 ++--
 xen/arch/x86/x86_64/compat/entry.S     |    2 +-
 xen/arch/x86/x86_64/entry.S            |    4 ++--
 xen/include/asm-x86/x86_32/asm_defns.h |    2 +-
 xen/include/asm-x86/x86_64/asm_defns.h |    2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff -r 6531202cdf1f -r 8fa76bc21363 xen/arch/x86/x86_32/asm-offsets.c
--- a/xen/arch/x86/x86_32/asm-offsets.c Tue Jan 25 14:54:42 2011 +0000
+++ b/xen/arch/x86/x86_32/asm-offsets.c Wed Jan 26 09:01:17 2011 +0000
@@ -116,8 +116,8 @@ void __dummy__(void)
     BLANK();
 
 #if PERF_COUNTERS
-    DEFINE(PERFC_hypercalls, PERFC_hypercalls);
-    DEFINE(PERFC_exceptions, PERFC_exceptions);
+    DEFINE(ASM_PERFC_hypercalls, PERFC_hypercalls);
+    DEFINE(ASM_PERFC_exceptions, PERFC_exceptions);
     BLANK();
 #endif
 
diff -r 6531202cdf1f -r 8fa76bc21363 xen/arch/x86/x86_32/entry.S
--- a/xen/arch/x86/x86_32/entry.S       Tue Jan 25 14:54:42 2011 +0000
+++ b/xen/arch/x86/x86_32/entry.S       Wed Jan 26 09:01:17 2011 +0000
@@ -162,7 +162,7 @@ 1:      sti
         GET_CURRENT(%ebx)
         cmpl  $NR_hypercalls,%eax
         jae   bad_hypercall
-        PERFC_INCR(PERFC_hypercalls, %eax, %ebx)
+        PERFC_INCR(hypercalls, %eax, %ebx)
 #ifndef NDEBUG
         /* Create shadow parameters and corrupt those not used by this call. */
         pushl %eax
@@ -452,7 +452,7 @@ 1:      xorl  %eax,%eax
         movl  %esp,%edx
         pushl %edx                      # push the cpu_user_regs pointer
         GET_CURRENT(%ebx)
-        PERFC_INCR(PERFC_exceptions, %eax, %ebx)
+        PERFC_INCR(exceptions, %eax, %ebx)
         call  *exception_table(,%eax,4)
         addl  $4,%esp
         movl  UREGS_eflags(%esp),%eax
diff -r 6531202cdf1f -r 8fa76bc21363 xen/arch/x86/x86_64/asm-offsets.c
--- a/xen/arch/x86/x86_64/asm-offsets.c Tue Jan 25 14:54:42 2011 +0000
+++ b/xen/arch/x86/x86_64/asm-offsets.c Wed Jan 26 09:01:17 2011 +0000
@@ -143,8 +143,8 @@ void __dummy__(void)
     BLANK();
 
 #if PERF_COUNTERS
-    DEFINE(PERFC_hypercalls, PERFC_hypercalls);
-    DEFINE(PERFC_exceptions, PERFC_exceptions);
+    DEFINE(ASM_PERFC_hypercalls, PERFC_hypercalls);
+    DEFINE(ASM_PERFC_exceptions, PERFC_exceptions);
     BLANK();
 #endif
 
diff -r 6531202cdf1f -r 8fa76bc21363 xen/arch/x86/x86_64/compat/entry.S
--- a/xen/arch/x86/x86_64/compat/entry.S        Tue Jan 25 14:54:42 2011 +0000
+++ b/xen/arch/x86/x86_64/compat/entry.S        Wed Jan 26 09:01:17 2011 +0000
@@ -72,7 +72,7 @@ ENTRY(compat_hypercall)
         movl  UREGS_rbp+SHADOW_BYTES(%rsp),%r9d   /* Arg 6        */
 #undef SHADOW_BYTES
 1:      leaq  compat_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. */
diff -r 6531202cdf1f -r 8fa76bc21363 xen/arch/x86/x86_64/entry.S
--- a/xen/arch/x86/x86_64/entry.S       Tue Jan 25 14:54:42 2011 +0000
+++ b/xen/arch/x86/x86_64/entry.S       Wed Jan 26 09:01:17 2011 +0000
@@ -175,7 +175,7 @@ ENTRY(syscall_enter)
         movq  UREGS_r9 +SHADOW_BYTES(%rsp),%r9    /* Arg 6        */
 #undef SHADOW_BYTES
 1:      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. */
@@ -472,7 +472,7 @@ 1:      movq  %rsp,%rdi
         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
diff -r 6531202cdf1f -r 8fa76bc21363 xen/include/asm-x86/x86_32/asm_defns.h
--- a/xen/include/asm-x86/x86_32/asm_defns.h    Tue Jan 25 14:54:42 2011 +0000
+++ b/xen/include/asm-x86/x86_32/asm_defns.h    Wed Jan 26 09:01:17 2011 +0000
@@ -83,7 +83,7 @@ 1:      addl  $4,%esp;
         pushl _cur;                                     \
         movl VCPU_processor(_cur),_cur;                 \
         shll $PERCPU_SHIFT,_cur;                        \
-        incl per_cpu__perfcounters+_name*4(_cur,_idx,4);\
+        incl per_cpu__perfcounters+ASM_PERFC_##_name*4(_cur,_idx,4);\
         popl _cur
 #else
 #define PERFC_INCR(_name,_idx,_cur)
diff -r 6531202cdf1f -r 8fa76bc21363 xen/include/asm-x86/x86_64/asm_defns.h
--- a/xen/include/asm-x86/x86_64/asm_defns.h    Tue Jan 25 14:54:42 2011 +0000
+++ b/xen/include/asm-x86/x86_64/asm_defns.h    Wed Jan 26 09:01:17 2011 +0000
@@ -71,7 +71,7 @@ 1:      addq  $8,%rsp;
         shlq $PERCPU_SHIFT,_cur;                \
         addq %rdx,_cur;                         \
         popq %rdx;                              \
-        incl _name*4(_cur,_idx,4);              \
+        incl ASM_PERFC_##_name*4(_cur,_idx,4);  \
         popq _cur
 #else
 #define PERFC_INCR(_name,_idx,_cur)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog