Attachment 874026 Details for Bug 1076116 – oprofile_no_code_domain_switch.patch

[patch] oprofile_no_code_domain_switch.patch

oprofile_no_code_domain_switch.patch (text/plain), 2.24 KB, created by Michel Normand on 2014-03-13 15:14:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Normand

Created: 2014-03-13 15:14:31 UTC

Size: 2.24 KB

patch

obsolete

>From c5c73e871bfe9b0ccbc97cd12ff55a53018ce889 Mon Sep 17 00:00:00 2001
>From: Michel Normand <normand@linux.vnet.ibm.com>
>Date: Thu, 13 Mar 2014 09:59:18 -0500
>Subject: [PATCH] code_domain_switch function not to be defined for powerpc
>
>the code_domain_switch function added by xen patch
>is not used in powerpc environment and its presence
>make the build to fail.
>
>So add an additionnal patch to not define the function
>if powerpc environment.
>
>Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
>
>diff --git a/oprofile.opd_trans.not_used_code_domain_switch.patch b/oprofile.opd_trans.not_used_code_domain_switch.patch
>new file mode 100644
>index 0000000..7ed08d3
>--- /dev/null
>+++ b/oprofile.opd_trans.not_used_code_domain_switch.patch
>@@ -0,0 +1,29 @@
>+Subject: oprofile opd_trans.c not using code_domain_switch
>+From: Michel Normand <normand@linux.vnet.ibm.com>
>+
>+The code_domain_switch static function is not used for powerpc env
>+so disable it for that environment.
>+
>+Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
>+Index: oprofile-0.9.9/daemon/opd_trans.c
>+===================================================================
>+--- oprofile-0.9.9.orig/daemon/opd_trans.c
>++++ oprofile-0.9.9/daemon/opd_trans.c
>+@@ -267,6 +267,7 @@ static void code_xen_enter(struct transi
>+ 	 * meaningless for Xen - same reason as for kernel */
>+ }
>+ 
>++#if ! defined(__powerpc__)
>+ static void code_domain_switch(struct transient *trans)
>+ {
>+ 	/* While processing passive domain samples we ensure (in_kernel!=0)
>+@@ -285,7 +286,8 @@ static void code_domain_switch(struct tr
>+ 	if (current_domain == COORDINATOR_DOMAIN)
>+ 		trans->in_kernel--;
>+ }
>+- 
>++#endif
>++
>+ extern void code_spu_profiling(struct transient * trans);
>+ extern void code_spu_ctx_switch(struct transient * trans);
>+ 
>diff --git a/oprofile.spec b/oprofile.spec
>index e5ccc81..2418604 100644
>--- a/oprofile.spec
>+++ b/oprofile.spec
>@@ -12,6 +12,7 @@ Requires(pre): shadow-utils
> Requires(postun): shadow-utils
> Patch10: oprofile-0.4-guess2.patch
> Patch83: oprofile-0.9.7-xen.patch
>+Patch84: oprofile.opd_trans.not_used_code_domain_switch.patch
> 
> URL: http://oprofile.sf.net
> 
>@@ -76,6 +77,7 @@ agent library.
> %setup -q -n %{name}-%{version}
> %patch10 -p1 -b .guess2
> %patch83 -p1 -b .xen
>+%patch84 -p1
> 
> ./autogen.sh
>

Actions: View | Diff

Attachments on bug 1076116: 874026