[kernel] r16252 - in dists/sid/linux-2.6/debian: . patches/debian patches/features/all/openvz patches/series

[Ben Hutchings]

Author: benh
Date: Thu Sep  9 02:34:10 2010
New Revision: 16252

Log:
Restore "sched, cputime: Introduce thread_group_times()"

To avoid an ABI change, move the new fields in struct signal_struct to
the end and hide them from genksyms.

Added:
   dists/sid/linux-2.6/debian/patches/debian/sched-Avoid-ABI-change-from-thread_group_times.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/features/all/openvz/openvz.patch
   dists/sid/linux-2.6/debian/patches/series/22

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Thu Sep  9 02:01:05 2010	(r16251)
+++ dists/sid/linux-2.6/debian/changelog	Thu Sep  9 02:34:10 2010	(r16252)
@@ -40,6 +40,8 @@
   * 3c59x: Fix deadlock in vortex_error() (Closes: #595554)
   * [x86] paravirt: Add a global synchronization point for pvclock (from
     2.6.32.16; reverted due to a regression which was addressed in 2.6.32.19)
+  * sched, cputime: Introduce thread_group_times() (from 2.6.32.19; reverted
+    due to the potential ABI change which we now carefully avoid)
 
   [ Bastian Blank ]
   * Use Breaks instead of Conflicts.

Added: dists/sid/linux-2.6/debian/patches/debian/sched-Avoid-ABI-change-from-thread_group_times.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/debian/sched-Avoid-ABI-change-from-thread_group_times.patch	Thu Sep  9 02:34:10 2010	(r16252)
@@ -0,0 +1,40 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Thu, 9 Sep 2010 03:09:03 +0100
+Subject: [PATCH] sched: Avoid ABI change from introduction of thread_group_times
+
+Move the new fields in struct signal_struct to the end and hide them
+from genksyms.
+---
+ include/linux/sched.h |    9 ++++++---
+ 1 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/include/linux/sched.h b/include/linux/sched.h
+index 3f77ccf..4b3dbc7 100644
+--- a/include/linux/sched.h
++++ b/include/linux/sched.h
+@@ -628,9 +628,6 @@ struct signal_struct {
+ 	cputime_t utime, stime, cutime, cstime;
+ 	cputime_t gtime;
+ 	cputime_t cgtime;
+-#ifndef CONFIG_VIRT_CPU_ACCOUNTING
+-	cputime_t prev_utime, prev_stime;
+-#endif
+ 	unsigned long nvcsw, nivcsw, cnvcsw, cnivcsw;
+ 	unsigned long min_flt, maj_flt, cmin_flt, cmaj_flt;
+ 	unsigned long inblock, oublock, cinblock, coublock;
+@@ -668,6 +665,12 @@ struct signal_struct {
+ #endif
+ 
+ 	int oom_adj;	/* OOM kill score adjustment (bit shift) */
++
++#ifndef __GENKSYMS__
++#ifndef CONFIG_VIRT_CPU_ACCOUNTING
++	cputime_t prev_utime, prev_stime;
++#endif
++#endif
+ };
+ 
+ /* Context switch must be unlocked if interrupts are to be enabled */
+-- 
+1.7.1
+

Modified: dists/sid/linux-2.6/debian/patches/features/all/openvz/openvz.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Thu Sep  9 02:01:05 2010	(r16251)
+++ dists/sid/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Thu Sep  9 02:34:10 2010	(r16252)
@@ -34420,8 +34420,8 @@
  
  /* Future-safe accessor for struct task_struct's cpus_allowed. */
 @@ -1726,6 +1778,43 @@ extern cputime_t task_utime(struct task_struct *p);
- extern cputime_t task_stime(struct task_struct *p);
  extern cputime_t task_gtime(struct task_struct *p);
+ extern void thread_group_times(struct task_struct *p, cputime_t *ut, cputime_t *st);
  
 +#ifndef CONFIG_VE
 +#define set_pn_state(tsk, state)	do { } while(0)

Modified: dists/sid/linux-2.6/debian/patches/series/22
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/22	Thu Sep  9 02:01:05 2010	(r16251)
+++ dists/sid/linux-2.6/debian/patches/series/22	Thu Sep  9 02:34:10 2010	(r16252)
@@ -103,3 +103,5 @@
 + bugfix/all/3c59x-Fix-deadlock-in-vortex_error.patch
 + features/all/netxen-unified-fw-image.patch
 - debian/revert-x86-paravirt-Add-a-global-synchronization-point.patch 
+- debian/revert-sched-cputime-Introduce-thread_group_times.patch
++ debian/sched-Avoid-ABI-change-from-thread_group_times.patch