rpms/kernel/F-10 patch-2.6.29-rc8-git6.bz2.sign, NONE, 1.1 .cvsignore, 1.1000, 1.1001 kernel.spec, 1.1298, 1.1299 linux-2.6-utrace-ftrace.patch, 1.1, 1.2 linux-2.6-utrace.patch, 1.107, 1.108 sources, 1.961, 1.962 upstream, 1.872, 1.873 patch-2.6.29-rc8-git5.bz2.sign, 1.1, NONE

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8908

Modified Files:
	.cvsignore kernel.spec linux-2.6-utrace-ftrace.patch 
	linux-2.6-utrace.patch sources upstream 
Added Files:
	patch-2.6.29-rc8-git6.bz2.sign 
Removed Files:
	patch-2.6.29-rc8-git5.bz2.sign 
Log Message:
2.6.29-rc8-git6
Copy utrace update from rawhide.


--- NEW FILE patch-2.6.29-rc8-git6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJxtF8yGugalF9Dw4RAqYhAJ0Z6sP+dMiJqOTy3Rph+FWGn8MUTQCdG0R2
dToqWMJBym3DSUXBekYwERU=
=hG8r
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.1000
retrieving revision 1.1001
diff -u -r1.1000 -r1.1001
--- .cvsignore	20 Mar 2009 22:31:05 -0000	1.1000
+++ .cvsignore	23 Mar 2009 03:29:46 -0000	1.1001
@@ -6,4 +6,4 @@
 kernel-2.6.28
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc8.bz2
-patch-2.6.29-rc8-git5.bz2
+patch-2.6.29-rc8-git6.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1298
retrieving revision 1.1299
diff -u -r1.1298 -r1.1299
--- kernel.spec	20 Mar 2009 22:31:05 -0000	1.1298
+++ kernel.spec	23 Mar 2009 03:29:46 -0000	1.1299
@@ -36,7 +36,7 @@
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 2
+%define stable_update 0
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -57,7 +57,7 @@
 # The rc snapshot level
 %define rcrev 8
 # The git snapshot level
-%define gitrev 5
+%define gitrev 6
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1773,6 +1773,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Mar 23 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.69.rc8.git6
+- 2.6.29-rc8-git6
+- Copy utrace update from rawhide.
+
 * Fri Mar 20 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.68.rc8.git5
 - 2.6.29-rc8-git5
 

linux-2.6-utrace-ftrace.patch:

Index: linux-2.6-utrace-ftrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-utrace-ftrace.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-utrace-ftrace.patch	19 Mar 2009 18:43:01 -0000	1.1
+++ linux-2.6-utrace-ftrace.patch	23 Mar 2009 03:29:47 -0000	1.2
@@ -35,9 +35,9 @@
  include/linux/processtrace.h |   41 +++
  kernel/trace/Kconfig         |    9 +
  kernel/trace/Makefile        |    1 +
- kernel/trace/trace.h         |   30 ++-
+ kernel/trace/trace.h         |    8 +
  kernel/trace/trace_process.c |  601 ++++++++++++++++++++++++++++++++++++++++++
- 5 files changed, 671 insertions(+), 11 deletions(-)
+ 5 files changed, 660 insertions(+), 0 deletions(-)
 
 diff --git a/include/linux/processtrace.h b/include/linux/processtrace.h
 new file mode 100644
@@ -118,7 +118,7 @@
  
  libftrace-y := ftrace.o
 diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
-index 4d3d381..b4ebccb 100644  
+index 4d3d381..c4d2e7f 100644  
 --- a/kernel/trace/trace.h
 +++ b/kernel/trace/trace.h
 @@ -7,6 +7,7 @@
@@ -133,29 +133,11 @@
  	TRACE_USER_STACK,
  	TRACE_HW_BRANCHES,
  	TRACE_POWER,
-+	TRACE_PROCESS,
++        TRACE_PROCESS,
  
  	__TRACE_LAST_TYPE
  };
-@@ -38,7 +40,7 @@ enum trace_type {
-  * The trace entry - the most basic unit of tracing. This is what
-  * is printed in the end as a single line in the trace output, such as:
-  *
-- *     bash-15816 [01]   235.197585: idle_cpu <- irq_enter
-+ *     bash-15816 [01]	 235.197585: idle_cpu <- irq_enter
-  */
- struct trace_entry {
- 	unsigned char		type;
-@@ -153,7 +155,7 @@ struct trace_boot_ret {
- #define TRACE_FILE_SIZE 20
- struct trace_branch {
- 	struct trace_entry	ent;
--	unsigned	        line;
-+	unsigned		line;
- 	char			func[TRACE_FUNC_SIZE+1];
- 	char			file[TRACE_FILE_SIZE+1];
- 	char			correct;
-@@ -170,11 +172,16 @@ struct trace_power {
+@@ -170,6 +172,11 @@ struct trace_power {
  	struct power_trace	state_data;
  };
  
@@ -167,71 +149,14 @@
  /*
   * trace_flag_type is an enumeration that holds different
   * states when a trace occurs. These are:
-  *  IRQS_OFF		- interrupts were disabled
-- *  IRQS_NOSUPPORT 	- arch does not support irqs_disabled_flags
-+ *  IRQS_NOSUPPORT	- arch does not support irqs_disabled_flags
-  *  NEED_RESCED		- reschedule is requested
-  *  HARDIRQ		- inside an interrupt handler
-  *  SOFTIRQ		- inside a softirq handler
-@@ -279,7 +286,8 @@ extern void __ftrace_bad_type(void);
- 		IF_ASSIGN(var, ent, struct ftrace_graph_ret_entry,	\
+@@ -280,6 +287,7 @@ extern void __ftrace_bad_type(void);
  			  TRACE_GRAPH_RET);		\
  		IF_ASSIGN(var, ent, struct hw_branch_entry, TRACE_HW_BRANCHES);\
-- 		IF_ASSIGN(var, ent, struct trace_power, TRACE_POWER); \
-+		IF_ASSIGN(var, ent, struct trace_power, TRACE_POWER); \
+  		IF_ASSIGN(var, ent, struct trace_power, TRACE_POWER); \
 +		IF_ASSIGN(var, ent, struct trace_process, TRACE_PROCESS); \
  		__ftrace_bad_type();					\
  	} while (0)
  
-@@ -297,8 +305,8 @@ enum print_line_t {
-  * flags value in struct tracer_flags.
-  */
- struct tracer_opt {
--	const char 	*name; /* Will appear on the trace_options file */
--	u32 		bit; /* Mask assigned in val field in tracer_flags */
-+	const char	*name; /* Will appear on the trace_options file */
-+	u32		bit; /* Mask assigned in val field in tracer_flags */
- };
- 
- /*
-@@ -307,7 +315,7 @@ struct tracer_opt {
-  */
- struct tracer_flags {
- 	u32			val;
--	struct tracer_opt 	*opts;
-+	struct tracer_opt	*opts;
- };
- 
- /* Makes more easy to define a tracer opt */
-@@ -339,7 +347,7 @@ struct tracer {
- 	int			(*set_flag)(u32 old_flags, u32 bit, int set);
- 	struct tracer		*next;
- 	int			print_max;
--	struct tracer_flags 	*flags;
-+	struct tracer_flags	*flags;
- };
- 
- struct trace_seq {
-@@ -561,7 +569,7 @@ static inline int ftrace_trace_task(stru
-  * positions into trace_flags that controls the output.
-  *
-  * NOTE: These bits must match the trace_options array in
-- *       trace.c.
-+ *	 trace.c.
-  */
- enum trace_iterator_flags {
- 	TRACE_ITER_PRINT_PARENT		= 0x01,
-@@ -578,8 +586,8 @@ enum trace_iterator_flags {
- 	TRACE_ITER_PREEMPTONLY		= 0x800,
- 	TRACE_ITER_BRANCH		= 0x1000,
- 	TRACE_ITER_ANNOTATE		= 0x2000,
--	TRACE_ITER_USERSTACKTRACE       = 0x4000,
--	TRACE_ITER_SYM_USEROBJ          = 0x8000,
-+	TRACE_ITER_USERSTACKTRACE	= 0x4000,
-+	TRACE_ITER_SYM_USEROBJ		= 0x8000,
- 	TRACE_ITER_PRINTK_MSGONLY	= 0x10000
- };
- 
 diff --git a/kernel/trace/trace_process.c b/kernel/trace/trace_process.c
 new file mode 100644
 index ...0820e56 100644  

linux-2.6-utrace.patch:

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-utrace.patch,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- linux-2.6-utrace.patch	19 Mar 2009 18:43:01 -0000	1.107
+++ linux-2.6-utrace.patch	23 Mar 2009 03:29:47 -0000	1.108
@@ -36,8 +36,8 @@
  init/Kconfig                      |    9 +
  kernel/Makefile                   |    1 +
  kernel/ptrace.c                   |   18 +-
- kernel/utrace.c                   | 2346 +++++++++++++++++++++++++++++++++++++
- 12 files changed, 3754 insertions(+), 3 deletions(-)
+ kernel/utrace.c                   | 2348 +++++++++++++++++++++++++++++++++++++
+ 12 files changed, 3756 insertions(+), 3 deletions(-)
 
 diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
 index 1462ed8..f5da1b4 100644  
@@ -651,17 +651,17 @@
  	if (p->files)
  		fdt = files_fdtable(p->files);
 diff --git a/include/linux/init_task.h b/include/linux/init_task.h
-index e752d97..ebce118 100644  
+index e752d97..39eebc8 100644  
 --- a/include/linux/init_task.h
 +++ b/include/linux/init_task.h
-@@ -184,6 +184,7 @@ extern struct cred init_cred;
+@@ -181,6 +181,7 @@ extern struct cred init_cred;
+ 		[PIDTYPE_SID]  = INIT_PID_LINK(PIDTYPE_SID),		\
+ 	},								\
+ 	.dirties = INIT_PROP_LOCAL_SINGLE(dirties),			\
++	INIT_UTRACE(tsk)						\
  	INIT_IDS							\
  	INIT_TRACE_IRQFLAGS						\
  	INIT_LOCKDEP							\
-+	INIT_UTRACE(tsk)						\
- }
- 
- 
 diff --git a/include/linux/sched.h b/include/linux/sched.h
 index 011db2f..786ef2d 100644  
 --- a/include/linux/sched.h
@@ -1583,7 +1583,7 @@
 +#endif	/* linux/utrace.h */
 diff --git a/include/linux/utrace_struct.h b/include/linux/utrace_struct.h
 new file mode 100644
-index ...22ce9e7 100644  
+index ...aba7e09 100644  
 --- /dev/null
 +++ b/include/linux/utrace_struct.h
 @@ -0,0 +1,58 @@
@@ -1636,7 +1636,7 @@
 +		.lock = __SPIN_LOCK_UNLOCKED(tsk.utrace.lock),		      \
 +		.attached = LIST_HEAD_INIT(tsk.utrace.attached),	      \
 +		.attaching = LIST_HEAD_INIT(tsk.utrace.attaching),	      \
-+	}
++	},
 +
 +#else
 +
@@ -1729,10 +1729,10 @@
  		 */
 diff --git a/kernel/utrace.c b/kernel/utrace.c
 new file mode 100644
-index ...4f1fb52 100644  
+index ...115be79 100644  
 --- /dev/null
 +++ b/kernel/utrace.c
-@@ -0,0 +1,2346 @@
+@@ -0,0 +1,2348 @@
 +/*
 + * utrace infrastructure interface for debugging user processes
 + *
@@ -3383,7 +3383,11 @@
 +	 */
 +	spin_lock(&utrace->lock);
 +	utrace->stopped = 0;
++	/*
++	 * Do start_report()'s work too since we already have the lock anyway.
++	 */
 +	utrace->report = 0;
++	splice_attaching(utrace);
 +	spin_unlock(&utrace->lock);
 +
 +	REPORT(task, utrace, &report, UTRACE_EVENT(JCTL),
@@ -3547,10 +3551,8 @@
 +	 * If UTRACE_INTERRUPT was just used, we don't bother with a
 +	 * report here.  We will report and stop in utrace_get_signal().
 +	 */
-+	if (unlikely(utrace->interrupt)) {
-+		BUG_ON(!signal_pending(task));
++	if (unlikely(utrace->interrupt))
 +		return;
-+	}
 +
 +	/*
 +	 * Do a simple reporting pass, with no callback after report_quiesce.
@@ -4073,7 +4075,7 @@
 +void task_utrace_proc_status(struct seq_file *m, struct task_struct *p)
 +{
 +	struct utrace *utrace = &p->utrace;
-+	seq_printf(m, "Utrace: %lx%s%s%s\n",
++	seq_printf(m, "Utrace:\t%lx%s%s%s\n",
 +		   p->utrace_flags,
 +		   utrace->stopped ? " (stopped)" : "",
 +		   utrace->report ? " (report)" : "",


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.961
retrieving revision 1.962
diff -u -r1.961 -r1.962
--- sources	20 Mar 2009 22:31:05 -0000	1.961
+++ sources	23 Mar 2009 03:29:47 -0000	1.962
@@ -1,3 +1,3 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
 0a86c29a637967fddeb1ba2ed8b33e59  patch-2.6.29-rc8.bz2
-57ff538a4a000dca0df87f93b92e202a  patch-2.6.29-rc8-git5.bz2
+d9e7915a1afe844e1dcf2e7daf7e7d91  patch-2.6.29-rc8-git6.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.872
retrieving revision 1.873
diff -u -r1.872 -r1.873
--- upstream	20 Mar 2009 22:31:06 -0000	1.872
+++ upstream	23 Mar 2009 03:29:47 -0000	1.873
@@ -1,3 +1,3 @@
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc8.bz2
-patch-2.6.29-rc8-git5.bz2
+patch-2.6.29-rc8-git6.bz2


--- patch-2.6.29-rc8-git5.bz2.sign DELETED ---