[oprofile] Re-enable xenoprof support.

William Eden Cohen wcohen at fedoraproject.org
Wed Apr 6 17:32:48 UTC 2011


commit 7fd4ba60f0898aedbef41dfa41a5350922021c5d
Author: William Cohen <wcohen at redhat.com>
Date:   Wed Apr 6 13:32:17 2011 -0400

    Re-enable xenoprof support.

 ...ile-0.9.3-xen.patch => oprofile-0.9.5-xen.patch |  187 +++++++++++---------
 oprofile.spec                                      |    8 +-
 2 files changed, 108 insertions(+), 87 deletions(-)
---
diff --git a/oprofile-0.9.3-xen.patch b/oprofile-0.9.5-xen.patch
similarity index 82%
rename from oprofile-0.9.3-xen.patch
rename to oprofile-0.9.5-xen.patch
index 7f21876..cc99eda 100644
--- a/oprofile-0.9.3-xen.patch
+++ b/oprofile-0.9.5-xen.patch
@@ -1,7 +1,7 @@
-diff -up oprofile-0.9.4/daemon/init.c.orig oprofile-0.9.4/daemon/init.c
---- oprofile-0.9.4/daemon/init.c.orig	2008-04-28 17:23:24.000000000 -0400
-+++ oprofile-0.9.4/daemon/init.c	2008-07-18 11:26:04.000000000 -0400
-@@ -309,6 +309,8 @@ static void opd_26_init(void)
+diff -Naur oprofile-0.9.5/daemon/init.c oprofile-0.9.5-xen/daemon/init.c
+--- oprofile-0.9.5/daemon/init.c	2009-07-31 10:10:19.000000000 -0700
++++ oprofile-0.9.5-xen/daemon/init.c	2009-11-18 15:03:02.000000000 -0800
+@@ -309,6 +309,8 @@
  
  	opd_create_vmlinux(vmlinux, kernel_range);
  	opd_create_xen(xenimage, xen_range);
@@ -10,11 +10,10 @@ diff -up oprofile-0.9.4/daemon/init.c.orig oprofile-0.9.4/daemon/init.c
  
  	opd_buf_size = opd_read_fs_int("/dev/oprofile/", "buffer_size", 1);
  	kernel_pointer_size = opd_read_fs_int("/dev/oprofile/", "pointer_size", 1);
-diff -up oprofile-0.9.4/daemon/opd_interface.h.orig oprofile-0.9.4/daemon/opd_interface.h
-diff -up oprofile-0.9.4/daemon/opd_kernel.c.orig oprofile-0.9.4/daemon/opd_kernel.c
---- oprofile-0.9.4/daemon/opd_kernel.c.orig	2006-01-16 08:21:09.000000000 -0500
-+++ oprofile-0.9.4/daemon/opd_kernel.c	2008-07-18 11:26:04.000000000 -0400
-@@ -34,11 +34,22 @@ static struct kernel_image vmlinux_image
+diff -Naur oprofile-0.9.5/daemon/opd_kernel.c oprofile-0.9.5-xen/daemon/opd_kernel.c
+--- oprofile-0.9.5/daemon/opd_kernel.c	2009-07-31 10:10:19.000000000 -0700
++++ oprofile-0.9.5-xen/daemon/opd_kernel.c	2009-11-18 15:03:02.000000000 -0800
+@@ -34,11 +34,22 @@
  
  static struct kernel_image xen_image;
  
@@ -37,7 +36,7 @@ diff -up oprofile-0.9.4/daemon/opd_kernel.c.orig oprofile-0.9.4/daemon/opd_kerne
  	/* for no vmlinux */
  	if (no_vmlinux) {
  		vmlinux_image.name = "no-vmlinux";
-@@ -57,13 +68,22 @@ void opd_create_vmlinux(char const * nam
+@@ -57,13 +68,22 @@
  		        vmlinux_image.start, vmlinux_image.end);
  		exit(EXIT_FAILURE);
  	}
@@ -60,7 +59,7 @@ diff -up oprofile-0.9.4/daemon/opd_kernel.c.orig oprofile-0.9.4/daemon/opd_kerne
  	/* for no xen */
  	if (no_xen) {
  		xen_image.name = "no-xen";
-@@ -72,18 +92,106 @@ void opd_create_xen(char const * name, c
+@@ -72,18 +92,106 @@
  
  	xen_image.name = xstrdup(name);
  
@@ -169,7 +168,7 @@ diff -up oprofile-0.9.4/daemon/opd_kernel.c.orig oprofile-0.9.4/daemon/opd_kerne
  
  /**
   * Allocate and initialise a kernel image description
-@@ -210,6 +318,75 @@ struct kernel_image * find_kernel_image(
+@@ -210,6 +318,75 @@
  	struct list_head * pos;
  	struct kernel_image * image = &vmlinux_image;
  
@@ -245,7 +244,7 @@ diff -up oprofile-0.9.4/daemon/opd_kernel.c.orig oprofile-0.9.4/daemon/opd_kerne
  	if (no_vmlinux)
  		return image;
  
-@@ -222,8 +399,5 @@ struct kernel_image * find_kernel_image(
+@@ -222,8 +399,5 @@
  			return image;
  	}
  
@@ -255,10 +254,10 @@ diff -up oprofile-0.9.4/daemon/opd_kernel.c.orig oprofile-0.9.4/daemon/opd_kerne
 -	return NULL;
 +	return &vmlinux_image_anon;
  }
-diff -up oprofile-0.9.4/daemon/opd_kernel.h.orig oprofile-0.9.4/daemon/opd_kernel.h
---- oprofile-0.9.4/daemon/opd_kernel.h.orig	2006-01-16 08:21:09.000000000 -0500
-+++ oprofile-0.9.4/daemon/opd_kernel.h	2008-07-18 11:26:04.000000000 -0400
-@@ -23,8 +23,12 @@ struct transient;
+diff -Naur oprofile-0.9.5/daemon/opd_kernel.h oprofile-0.9.5-xen/daemon/opd_kernel.h
+--- oprofile-0.9.5/daemon/opd_kernel.h	2009-07-31 10:10:19.000000000 -0700
++++ oprofile-0.9.5-xen/daemon/opd_kernel.h	2009-11-18 15:03:02.000000000 -0800
+@@ -23,8 +23,12 @@
  /** create the kernel image */
  void opd_create_vmlinux(char const * name, char const * arg);
  
@@ -271,7 +270,7 @@ diff -up oprofile-0.9.4/daemon/opd_kernel.h.orig oprofile-0.9.4/daemon/opd_kerne
  /** opd_reread_module_info - parse /proc/modules for kernel modules */
  void opd_reread_module_info(void);
  
-@@ -33,6 +37,7 @@ struct kernel_image {
+@@ -33,6 +37,7 @@
  	char * name;
  	vma_t start;
  	vma_t end;
@@ -279,10 +278,10 @@ diff -up oprofile-0.9.4/daemon/opd_kernel.h.orig oprofile-0.9.4/daemon/opd_kerne
  	struct list_head list;
  };
  
-diff -up oprofile-0.9.4/daemon/opd_sfile.c.orig oprofile-0.9.4/daemon/opd_sfile.c
---- oprofile-0.9.4/daemon/opd_sfile.c.orig	2007-05-10 19:42:33.000000000 -0400
-+++ oprofile-0.9.4/daemon/opd_sfile.c	2008-07-18 11:26:10.000000000 -0400
-@@ -234,7 +234,7 @@ struct sfile * sfile_find(struct transie
+diff -Naur oprofile-0.9.5/daemon/opd_sfile.c oprofile-0.9.5-xen/daemon/opd_sfile.c
+--- oprofile-0.9.5/daemon/opd_sfile.c	2009-07-31 10:10:19.000000000 -0700
++++ oprofile-0.9.5-xen/daemon/opd_sfile.c	2009-11-18 15:03:02.000000000 -0800
+@@ -240,7 +240,7 @@
  	}
  
  	/* we might need a kernel image start/end to hash on */
@@ -291,9 +290,9 @@ diff -up oprofile-0.9.4/daemon/opd_sfile.c.orig oprofile-0.9.4/daemon/opd_sfile.
  		ki = find_kernel_image(trans);
  		if (!ki) {
  			verbprintf(vsamples, "Lost kernel sample %llx\n", trans->pc);
-diff -up oprofile-0.9.4/daemon/opd_trans.c.orig oprofile-0.9.4/daemon/opd_trans.c
---- oprofile-0.9.4/daemon/opd_trans.c.orig	2008-01-14 21:05:47.000000000 -0500
-+++ oprofile-0.9.4/daemon/opd_trans.c	2008-07-18 11:34:07.000000000 -0400
+diff -Naur oprofile-0.9.5/daemon/opd_trans.c oprofile-0.9.5-xen/daemon/opd_trans.c
+--- oprofile-0.9.5/daemon/opd_trans.c	2009-07-31 10:10:19.000000000 -0700
++++ oprofile-0.9.5-xen/daemon/opd_trans.c	2009-11-18 15:03:02.000000000 -0800
 @@ -31,6 +31,8 @@
  #include <stdio.h>
  #include <errno.h>
@@ -303,7 +302,7 @@ diff -up oprofile-0.9.4/daemon/opd_trans.c.orig oprofile-0.9.4/daemon/opd_trans.
  extern size_t kernel_pointer_size;
  
  
-@@ -203,6 +205,9 @@ static void code_kernel_enter(struct tra
+@@ -203,6 +205,9 @@
  {
  	verbprintf(vmisc, "KERNEL_ENTER_SWITCH to kernel\n");
  	trans->in_kernel = 1;
@@ -313,7 +312,7 @@ diff -up oprofile-0.9.4/daemon/opd_trans.c.orig oprofile-0.9.4/daemon/opd_trans.
  	clear_trans_current(trans);
  	/* subtlety: we must keep trans->cookie cached,
  	 * even though it's meaningless for the kernel -
-@@ -216,6 +221,9 @@ static void code_user_enter(struct trans
+@@ -216,6 +221,9 @@
  {
  	verbprintf(vmisc, "USER_ENTER_SWITCH to user-space\n");
  	trans->in_kernel = 0;
@@ -323,26 +322,26 @@ diff -up oprofile-0.9.4/daemon/opd_trans.c.orig oprofile-0.9.4/daemon/opd_trans.
  	clear_trans_current(trans);
  	clear_trans_last(trans);
  }
-@@ -244,15 +252,33 @@ static void code_trace_begin(struct tran
+@@ -244,17 +252,34 @@
  static void code_xen_enter(struct transient * trans)
  {
  	verbprintf(vmisc, "XEN_ENTER_SWITCH to xen\n");
 -	trans->in_kernel = 1;
-+ 	trans->in_kernel = 2;
-+ 	/* if in passive domain mode cpu mode should be incremented */
-+ 	if (current_domain != COORDINATOR_DOMAIN)
-+ 		trans->in_kernel++;
++	trans->in_kernel = 2;
++	/* if in passive domain mode cpu mode should be incremented */
++	if (current_domain != COORDINATOR_DOMAIN)
++		trans->in_kernel++;
  	trans->current = NULL;
- 	/* subtlety: we must keep trans->cookie cached, even though it's 
--	 * meaningless for Xen - we won't necessarily get a cookie switch 
--	 * on Xen exit. See comments in opd_sfile.c. It seems that we can 
--	 * get away with in_kernel = 1 as long as we supply the correct 
--	 * Xen image, and its address range in startup find_kernel_image 
+ 	/* subtlety: we must keep trans->cookie cached, even though it's
+-	 * meaningless for Xen - we won't necessarily get a cookie switch
+-	 * on Xen exit. See comments in opd_sfile.c. It seems that we can
+-	 * get away with in_kernel = 1 as long as we supply the correct
+-	 * Xen image, and its address range in startup find_kernel_image
 -	 * is modified to look in the Xen image also
+-	 */
 +	 * meaningless for Xen - same reason as for kernel */
-+
-+}
-+
+ }
+ 
 +static void code_domain_switch(struct transient *trans)
 +{
 +	/* While processing passive domain samples we ensure (in_kernel!=0)
@@ -350,7 +349,7 @@ diff -up oprofile-0.9.4/daemon/opd_trans.c.orig oprofile-0.9.4/daemon/opd_trans.
 +	 * But, we have to remember the kernel value for coordinator domain, 
 +	 * so we do the safe thing: increment when leaving the coordinator
 +	 * domain and decrement when returning to it 
- 	 */
++ 	 */
 +	if (current_domain == COORDINATOR_DOMAIN)
 +		trans->in_kernel++;
 +
@@ -360,20 +359,23 @@ diff -up oprofile-0.9.4/daemon/opd_trans.c.orig oprofile-0.9.4/daemon/opd_trans.
 +	/* If returning to coordinator domain restore the kernel value */
 +	if (current_domain == COORDINATOR_DOMAIN)
 +		trans->in_kernel--;
- }
- 
++}
++ 
  extern void code_spu_profiling(struct transient * trans);
-@@ -275,6 +301,7 @@ handler_t handlers[LAST_CODE + 1] = {
+ extern void code_spu_ctx_switch(struct transient * trans);
+ 
+@@ -278,7 +303,7 @@
  	&code_spu_profiling,
  	&code_spu_ctx_switch,
- #endif
-+	&code_domain_switch,
+ #else
+-	&code_unknown,
++ 	&code_domain_switch,
  	&code_unknown,
- };
- 
-diff -up oprofile-0.9.4/daemon/opd_trans.h.orig oprofile-0.9.4/daemon/opd_trans.h
---- oprofile-0.9.4/daemon/opd_trans.h.orig	2007-05-10 19:42:33.000000000 -0400
-+++ oprofile-0.9.4/daemon/opd_trans.h	2008-07-18 11:26:10.000000000 -0400
+ #endif
+ 	&code_ibs_fetch_sample,
+diff -Naur oprofile-0.9.5/daemon/opd_trans.h oprofile-0.9.5-xen/daemon/opd_trans.h
+--- oprofile-0.9.5/daemon/opd_trans.h	2009-07-31 10:10:19.000000000 -0700
++++ oprofile-0.9.5-xen/daemon/opd_trans.h	2009-11-18 15:03:02.000000000 -0800
 @@ -21,6 +21,10 @@
  
  #include <stdint.h>
@@ -385,10 +387,10 @@ diff -up oprofile-0.9.4/daemon/opd_trans.h.orig oprofile-0.9.4/daemon/opd_trans.
  struct sfile;
  struct anon_mapping;
  
-diff -up oprofile-0.9.4/daemon/oprofiled.c.orig oprofile-0.9.4/daemon/oprofiled.c
---- oprofile-0.9.4/daemon/oprofiled.c.orig	2008-04-28 17:23:23.000000000 -0400
-+++ oprofile-0.9.4/daemon/oprofiled.c	2008-07-18 11:26:10.000000000 -0400
-@@ -68,6 +68,7 @@ char * session_dir;
+diff -Naur oprofile-0.9.5/daemon/oprofiled.c oprofile-0.9.5-xen/daemon/oprofiled.c
+--- oprofile-0.9.5/daemon/oprofiled.c	2009-07-31 10:10:19.000000000 -0700
++++ oprofile-0.9.5-xen/daemon/oprofiled.c	2009-11-18 15:03:02.000000000 -0800
+@@ -71,6 +71,7 @@
  int no_xen;
  char * xenimage;
  char * xen_range;
@@ -396,7 +398,7 @@ diff -up oprofile-0.9.4/daemon/oprofiled.c.orig oprofile-0.9.4/daemon/oprofiled.
  static char * verbose;
  static char * binary_name_filter;
  static char * events;
-@@ -87,6 +88,7 @@ static struct poptOption options[] = {
+@@ -91,6 +92,7 @@
  	{ "xen-range", 0, POPT_ARG_STRING, &xen_range, 0, "Xen VMA range", "start-end", },
  	{ "xen-image", 0, POPT_ARG_STRING, &xenimage, 0, "Xen image", "file", },
  	{ "image", 0, POPT_ARG_STRING, &binary_name_filter, 0, "image name filter", "profile these comma separated image" },
@@ -404,20 +406,20 @@ diff -up oprofile-0.9.4/daemon/oprofiled.c.orig oprofile-0.9.4/daemon/oprofiled.
  	{ "separate-lib", 0, POPT_ARG_INT, &separate_lib, 0, "separate library samples for each distinct application", "[0|1]", },
  	{ "separate-kernel", 0, POPT_ARG_INT, &separate_kernel, 0, "separate kernel samples for each distinct application", "[0|1]", },
  	{ "separate-thread", 0, POPT_ARG_INT, &separate_thread, 0, "thread-profiling mode", "[0|1]" },
-diff -up oprofile-0.9.4/daemon/oprofiled.h.orig oprofile-0.9.4/daemon/oprofiled.h
---- oprofile-0.9.4/daemon/oprofiled.h.orig	2008-04-28 17:23:23.000000000 -0400
-+++ oprofile-0.9.4/daemon/oprofiled.h	2008-07-18 11:26:10.000000000 -0400
-@@ -65,5 +65,6 @@ extern char * kernel_range;
+diff -Naur oprofile-0.9.5/daemon/oprofiled.h oprofile-0.9.5-xen/daemon/oprofiled.h
+--- oprofile-0.9.5/daemon/oprofiled.h	2009-07-31 10:10:19.000000000 -0700
++++ oprofile-0.9.5-xen/daemon/oprofiled.h	2009-11-18 15:03:02.000000000 -0800
+@@ -65,5 +65,6 @@
  extern int no_xen;
  extern char * xenimage;
  extern char * xen_range;
 +extern char * xen_passive_setup;
  
  #endif /* OPROFILED_H */
-diff -up oprofile-0.9.4/doc/opcontrol.1.in.orig oprofile-0.9.4/doc/opcontrol.1.in
---- oprofile-0.9.4/doc/opcontrol.1.in.orig	2007-08-14 15:05:37.000000000 -0400
-+++ oprofile-0.9.4/doc/opcontrol.1.in	2008-07-18 11:26:10.000000000 -0400
-@@ -149,12 +149,41 @@ Xen image
+diff -Naur oprofile-0.9.5/doc/opcontrol.1.in oprofile-0.9.5-xen/doc/opcontrol.1.in
+--- oprofile-0.9.5/doc/opcontrol.1.in	2009-07-31 10:10:18.000000000 -0700
++++ oprofile-0.9.5-xen/doc/opcontrol.1.in	2009-11-18 15:03:02.000000000 -0800
+@@ -149,12 +149,41 @@
  .br
  .TP
  .BI "--active-domains="<list>
@@ -461,10 +463,24 @@ diff -up oprofile-0.9.4/doc/opcontrol.1.in.orig oprofile-0.9.4/doc/opcontrol.1.i
  .br
  
  .SH ENVIRONMENT
-diff -up oprofile-0.9.4/utils/opcontrol.orig oprofile-0.9.4/utils/opcontrol
---- oprofile-0.9.4/utils/opcontrol.orig	2008-04-28 17:23:23.000000000 -0400
-+++ oprofile-0.9.4/utils/opcontrol	2008-07-18 11:26:10.000000000 -0400
-@@ -158,9 +158,16 @@ do_help()
+diff -Naur oprofile-0.9.5/libpp/format_output.cpp oprofile-0.9.5-xen/libpp/format_output.cpp
+--- oprofile-0.9.5/libpp/format_output.cpp	2009-07-31 10:10:18.000000000 -0700
++++ oprofile-0.9.5-xen/libpp/format_output.cpp	2009-11-18 15:03:14.000000000 -0800
+@@ -287,8 +287,8 @@
+ {
+ 	return get_image_name(f.symbol.app_name,
+ 		long_filenames 
+-			? image_name_storage::int_real_filename
+-			: image_name_storage::int_real_basename,
++			? image_name_storage::int_filename
++			: image_name_storage::int_basename,
+ 		extra_found_images);
+ }
+ 
+diff -Naur oprofile-0.9.5/utils/opcontrol oprofile-0.9.5-xen/utils/opcontrol
+--- oprofile-0.9.5/utils/opcontrol	2009-07-31 10:10:18.000000000 -0700
++++ oprofile-0.9.5-xen/utils/opcontrol	2009-11-18 15:03:02.000000000 -0800
+@@ -159,9 +159,16 @@
     --cpu-buffer-size=num         per-cpu buffer size in units (2.6 only)
     --note-table-size             kernel notes buffer size in notes units (2.4 only)
  
@@ -481,10 +497,10 @@ diff -up oprofile-0.9.4/utils/opcontrol.orig oprofile-0.9.4/utils/opcontrol
 +   --passive-images=file[,files] list of kernel images associated with each passive domain
 +     or 
 +   --domain-images=file[,files]
- " >&2
+ EOF
  }
  
-@@ -303,6 +310,9 @@ do_init()
+@@ -310,6 +317,9 @@
  	SETUP_DIR="/root/.oprofile"
  	SETUP_FILE="$SETUP_DIR/daemonrc"
  
@@ -494,7 +510,7 @@ diff -up oprofile-0.9.4/utils/opcontrol.orig oprofile-0.9.4/utils/opcontrol
  	# initialize daemon vars
  	decide_oprofile_device_mount
  	CPUTYPE=`cat $MOUNT/cpu_type`
-@@ -447,7 +457,7 @@ do_load_setup()
+@@ -420,7 +430,7 @@
  }
  
  
@@ -503,7 +519,7 @@ diff -up oprofile-0.9.4/utils/opcontrol.orig oprofile-0.9.4/utils/opcontrol
  {
  	if test -z "$VMLINUX"; then
  		echo "No vmlinux file specified. You must specify the correct vmlinux file, e.g." >&2
-@@ -468,8 +478,12 @@ check_valid_args()
+@@ -441,8 +451,12 @@
  
  	echo "The specified vmlinux file \"$VMLINUX\" doesn't exist." >&2
  	exit 1
@@ -516,10 +532,10 @@ diff -up oprofile-0.9.4/utils/opcontrol.orig oprofile-0.9.4/utils/opcontrol
  	if test -f "$XENIMAGE"; then
  		return
  	fi
-@@ -529,6 +543,76 @@ get_image_range()
- 	fi
+@@ -503,6 +517,77 @@
  }
-  
+ 
+ 
 +set_passive_domain()
 +{
 +	DOMAIN_ID=$1
@@ -590,10 +606,11 @@ diff -up oprofile-0.9.4/utils/opcontrol.orig oprofile-0.9.4/utils/opcontrol
 +	fi
 +}
 +
-  
++  
  # validate --separate= parameters. This function is called with IFS=,
  # so on each argument is splitted
-@@ -843,6 +927,16 @@ do_options()
+ validate_separate_args()
+@@ -819,6 +904,16 @@
  				ACTIVE_DOMAINS=$val
  				DO_SETUP=yes
  				;;
@@ -610,7 +627,7 @@ diff -up oprofile-0.9.4/utils/opcontrol.orig oprofile-0.9.4/utils/opcontrol
  			--note-table-size)
  				error_if_empty $arg $val
  				if test "$KERNEL_SUPPORT" = "yes"; then
-@@ -915,6 +1009,16 @@ do_options()
+@@ -1251,6 +1346,16 @@
  			exit 1
  		fi
  	fi
@@ -627,7 +644,7 @@ diff -up oprofile-0.9.4/utils/opcontrol.orig oprofile-0.9.4/utils/opcontrol
  }
  
  
-@@ -1230,6 +1334,15 @@ do_param_setup()
+@@ -1289,6 +1394,15 @@
  		fi
  	fi
  
@@ -643,9 +660,9 @@ diff -up oprofile-0.9.4/utils/opcontrol.orig oprofile-0.9.4/utils/opcontrol
  	if test $NOTE_SIZE != 0; then
  		set_param notesize $NOTE_SIZE
  	fi
-@@ -1360,7 +1473,8 @@ do_start_daemon()
+@@ -1437,7 +1551,8 @@
  	fi
-  
+ 
  	do_setup
 -	check_valid_args
 + 	check_valid_vmlinux
@@ -653,7 +670,7 @@ diff -up oprofile-0.9.4/utils/opcontrol.orig oprofile-0.9.4/utils/opcontrol
  	get_image_range "linux"
  	get_image_range "xen"
  	do_param_setup
-@@ -1388,6 +1502,10 @@ do_start_daemon()
+@@ -1467,6 +1582,10 @@
  		OPD_ARGS="$OPD_ARGS --image=$IMAGE_FILTER"
  	fi
  
@@ -664,7 +681,7 @@ diff -up oprofile-0.9.4/utils/opcontrol.orig oprofile-0.9.4/utils/opcontrol
  	if test -n "$VERBOSE"; then
  		OPD_ARGS="$OPD_ARGS --verbose=$VERBOSE"
  	fi
-@@ -1582,6 +1700,8 @@ do_save_session()
+@@ -1663,6 +1782,8 @@
  	fi
  
  	hup_daemon
@@ -673,9 +690,9 @@ diff -up oprofile-0.9.4/utils/opcontrol.orig oprofile-0.9.4/utils/opcontrol
  }
  
  
-@@ -1631,7 +1751,8 @@ do_operations()
+@@ -1713,7 +1834,8 @@
  	fi
-  
+ 
  	if test "$SETUP" = "yes"; then
 -		check_valid_args
 +		check_valid_vmlinux
diff --git a/oprofile.spec b/oprofile.spec
index 59834fd..738c60a 100644
--- a/oprofile.spec
+++ b/oprofile.spec
@@ -1,7 +1,7 @@
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.6
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPLv2
 Group: Development/System
 #
@@ -12,7 +12,7 @@ Requires(pre): shadow-utils
 Requires(postun): shadow-utils
 Patch10: oprofile-0.4-guess2.patch
 Patch63: oprofile-0.7-libs.patch
-Patch83: oprofile-0.9.3-xen.patch
+Patch83: oprofile-0.9.5-xen.patch
 #Patch104: oprofile-jvmpi-lgpl.patch
 #Patch105: oprofile-0.9.5-timer.patch
 Patch106: oprofile-sect.patch
@@ -90,6 +90,7 @@ agent library.
 %setup -q -n %{name}-%{version}
 %patch10 -p1 -b .guess2
 %patch63 -p1 -b .libs
+%patch83 -p1
 %patch106 -p1 -b .sect
 %patch120 -p1
 %patch121 -p1
@@ -244,6 +245,9 @@ test "$1" != 0 || groupdel oprofile &>/dev/null || :
 /etc/ld.so.conf.d/*
 
 %changelog
+* Tue Apr 5 2011 Will Cohen <wcohen at redhat.com> - 0.9.6-20
+- Re-enable xenoprof patch.
+
 * Thu Mar 31 2011 Will Cohen <wcohen at redhat.com> - 0.9.6-19
 - Provide oprofile-static.
 


More information about the scm-commits mailing list