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>
xen-unstable changeset:   22814:b9017fdaad4d
xen-unstable date:        Wed Jan 26 08:35:24 2011 +0000

diff --git a/xen/arch/x86/x86_32/asm-offsets.c b/xen/arch/x86/x86_32/asm-offsets.c
index a3d3680d0032ce0ea050c51e7454034564617fc7..8d3388035161015da3529c7824ca18cca1f47d28 100644 (file)
--- a/xen/arch/x86/x86_32/asm-offsets.c
+++ b/xen/arch/x86/x86_32/asm-offsets.c
@@ -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 --git a/xen/arch/x86/x86_32/entry.S b/xen/arch/x86/x86_32/entry.S
index 5ea96a58f723c691242c391b89184a56a4d1ea72..5d22dabb7cd3d7a934b4721a7d1ae4b665a0c8c6 100644 (file)
--- a/xen/arch/x86/x86_32/entry.S
+++ b/xen/arch/x86/x86_32/entry.S
@@ -162,7 +162,7 @@ ENTRY(hypercall)
         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 @@ handle_exception:
         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 --git a/xen/arch/x86/x86_64/asm-offsets.c b/xen/arch/x86/x86_64/asm-offsets.c
index 7fe1934b61b63d83d8219a776c0c7c46fde97956..c763ed0684319a8492f384d6f68fbee7b768298b 100644 (file)
--- a/xen/arch/x86/x86_64/asm-offsets.c
+++ b/xen/arch/x86/x86_64/asm-offsets.c
@@ -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 --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S
index c8a5bfb509e43f9e6adec016e28eac6f6cb6dc93..d313cd73888362afc75f9c2d6aa1e4bc25a94a3e 100644 (file)
--- a/xen/arch/x86/x86_64/compat/entry.S
+++ b/xen/arch/x86/x86_64/compat/entry.S
@@ -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 --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S
index a579e608685712512639fa56ba01476d17493ca0..8d862d5f92569e713d9406f6e090c34b84b9344a 100644 (file)
--- a/xen/arch/x86/x86_64/entry.S
+++ b/xen/arch/x86/x86_64/entry.S
@@ -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 @@ 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

diff --git a/xen/include/asm-x86/x86_32/asm_defns.h b/xen/include/asm-x86/x86_32/asm_defns.h
index bbdd55efce52e386ba4b124a4c41f0a67646ed9e..473519dfdc84e7296824501af87da7024e46cb4e 100644 (file)
--- a/xen/include/asm-x86/x86_32/asm_defns.h
+++ b/xen/include/asm-x86/x86_32/asm_defns.h
@@ -83,7 +83,7 @@
         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 --git a/xen/include/asm-x86/x86_64/asm_defns.h b/xen/include/asm-x86/x86_64/asm_defns.h
index 328c5263aa5628479607ea68afa680e32be07366..4d741c9338e2c9432717a2fa484dad1767402d91 100644 (file)
--- a/xen/include/asm-x86/x86_64/asm_defns.h
+++ b/xen/include/asm-x86/x86_64/asm_defns.h
@@ -71,7 +71,7 @@
         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)