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

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1296030924 0
# Node ID b9017fdaad4dedfb8f953d2c6388d910ab2ab3c8
# Parent  f28ab5926896afbe4b0246bfcd09e6aba466fc47
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/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 f28ab5926896 -r b9017fdaad4d xen/arch/x86/x86_32/asm-offsets.c
--- a/xen/arch/x86/x86_32/asm-offsets.c Wed Jan 26 08:17:14 2011 +0000
+++ b/xen/arch/x86/x86_32/asm-offsets.c Wed Jan 26 08:35:24 2011 +0000
@@ -120,8 +120,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 f28ab5926896 -r b9017fdaad4d xen/arch/x86/x86_32/entry.S
--- a/xen/arch/x86/x86_32/entry.S       Wed Jan 26 08:17:14 2011 +0000
+++ b/xen/arch/x86/x86_32/entry.S       Wed Jan 26 08:35:24 2011 +0000
@@ -147,7 +147,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
@@ -446,7 +446,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 f28ab5926896 -r b9017fdaad4d xen/arch/x86/x86_64/asm-offsets.c
--- a/xen/arch/x86/x86_64/asm-offsets.c Wed Jan 26 08:17:14 2011 +0000
+++ b/xen/arch/x86/x86_64/asm-offsets.c Wed Jan 26 08:35:24 2011 +0000
@@ -146,8 +146,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 f28ab5926896 -r b9017fdaad4d xen/arch/x86/x86_64/compat/entry.S
--- a/xen/arch/x86/x86_64/compat/entry.S        Wed Jan 26 08:17:14 2011 +0000
+++ b/xen/arch/x86/x86_64/compat/entry.S        Wed Jan 26 08:35:24 2011 +0000
@@ -62,7 +62,7 @@ UNLIKELY_START(ne, compat_trace)
 #undef SHADOW_BYTES
 UNLIKELY_END(compat_trace)
         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 f28ab5926896 -r b9017fdaad4d xen/arch/x86/x86_64/entry.S
--- a/xen/arch/x86/x86_64/entry.S       Wed Jan 26 08:17:14 2011 +0000
+++ b/xen/arch/x86/x86_64/entry.S       Wed Jan 26 08:35:24 2011 +0000
@@ -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 @@ 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 f28ab5926896 -r b9017fdaad4d xen/include/asm-x86/x86_32/asm_defns.h
--- a/xen/include/asm-x86/x86_32/asm_defns.h    Wed Jan 26 08:17:14 2011 +0000
+++ b/xen/include/asm-x86/x86_32/asm_defns.h    Wed Jan 26 08:35:24 2011 +0000
@@ -86,7 +86,7 @@ 1:      addl  $4,%esp;
         pushl _cur;                                     \
         movl VCPU_processor(_cur),_cur;                 \
         movl __per_cpu_offset(,_cur,4),_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 f28ab5926896 -r b9017fdaad4d xen/include/asm-x86/x86_64/asm_defns.h
--- a/xen/include/asm-x86/x86_64/asm_defns.h    Wed Jan 26 08:17:14 2011 +0000
+++ b/xen/include/asm-x86/x86_64/asm_defns.h    Wed Jan 26 08:35:24 2011 +0000
@@ -72,7 +72,7 @@ 1:      addq  $8,%rsp;
         leaq per_cpu__perfcounters(%rip),%rdx;  \
         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