[PATCH] xenoprof: Cleanup

[PATCH] xenoprof: Cleanup

[KUWAMURA Shin'ya]

[-- Attachment #1: Type: Text/Plain, Size: 158 bytes --]

Hi,

The declaration of ibs_caps also exists in xen/include/asm-x86/xenoprof.h.

Signed-off-by: KUWAMURA Shin'ya <kuwa@jp.fujitsu.com>
-- 
  KUWAMURA Shin'ya

[-- Attachment #2: fix-ibs-common.patch --]
[-- Type: Text/X-Patch, Size: 746 bytes --]

# HG changeset patch
# User KUWAMURA Shin'ya <kuwa@jp.fujitsu.com>
# Date 1281059014 -32400
# Node ID df011b5dc4ce566502331003d311d44d2f94eec4
# Parent  668f712242410d1d8d4613ae7ec2f608b4f0f4c2
xenoprof: Cleanup

The declaration of ibs_caps also exists in xen/include/asm-x86/xenoprof.h.

Signed-off-by: KUWAMURA Shin'ya <kuwa@jp.fujitsu.com>

diff -r 668f71224241 -r df011b5dc4ce xen/common/xenoprof.c
--- a/xen/common/xenoprof.c	Mon Aug 02 16:58:50 2010 +0100
+++ b/xen/common/xenoprof.c	Fri Aug 06 10:43:34 2010 +0900
@@ -48,9 +48,6 @@ static u64 passive_samples;
 static u64 passive_samples;
 static u64 idle_samples;
 static u64 others_samples;
-
-/* AMD IBS support */
-extern u32 ibs_caps;
 
 int acquire_pmu_ownership(int pmu_ownship)
 {

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

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

Re: [PATCH] xenoprof: Cleanup

[Ian Jackson]

KUWAMURA Shin'ya writes ("[Xen-devel] [PATCH] xenoprof: Cleanup"):
> The declaration of ibs_caps also exists in xen/include/asm-x86/xenoprof.h.
...
> -/* AMD IBS support */
> -extern u32 ibs_caps;

But, in xen/common/xenoprof.c, surely this should be a definition and
not a declaration.  So more correct would be

 -extern u32 ibs_caps;
 +u32 ibs_caps;

but that would conflict with the #define in
xen/include/asm-ia64/xenoprof.h.  So I'm not sure this fix is complete.

Ian.

Re: [PATCH] xenoprof: Cleanup

[Keir Fraser]

On 10/08/2010 16:55, "Ian Jackson" <Ian.Jackson@eu.citrix.com> wrote:

> KUWAMURA Shin'ya writes ("[Xen-devel] [PATCH] xenoprof: Cleanup"):
>> The declaration of ibs_caps also exists in xen/include/asm-x86/xenoprof.h.
> ...
>> -/* AMD IBS support */
>> -extern u32 ibs_caps;
> 
> But, in xen/common/xenoprof.c, surely this should be a definition and
> not a declaration.  So more correct would be
> 
>  -extern u32 ibs_caps;
>  +u32 ibs_caps;
> 
> but that would conflict with the #define in
> xen/include/asm-ia64/xenoprof.h.  So I'm not sure this fix is complete.

It's defined in arch-specific arch/x86/oprofile/op_model_athlon.c. Exposed
to common/xenoprof.c in the arch-specific include/asm-x86/xenoprof.h (and
stubbed out in ia64's equivalent header).

 -- Keir