[kernel] r15803 - dists/sid/linux-2.6/debian/patches/features/all/openvz
Ben Hutchings
benh at alioth.debian.org
Fri May 28 23:32:15 UTC 2010
Author: benh
Date: Fri May 28 23:32:11 2010
New Revision: 15803
Log:
Fix-up openvz.patch again to avoid ABI change
Modified:
dists/sid/linux-2.6/debian/patches/features/all/openvz/openvz.patch
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 Fri May 28 21:05:54 2010 (r15802)
+++ dists/sid/linux-2.6/debian/patches/features/all/openvz/openvz.patch Fri May 28 23:32:11 2010 (r15803)
@@ -34331,9 +34331,9 @@
*/
struct pipe_inode_info *splice_pipe;
@@ -1541,6 +1580,19 @@ struct task_struct {
- /* bitmask of trace recursion */
unsigned long trace_recursion;
#endif /* CONFIG_TRACING */
+ unsigned long stack_start;
+#ifdef CONFIG_BEANCOUNTERS
+ struct task_beancounter task_bc;
+#endif
@@ -34347,9 +34347,9 @@
+#ifdef CONFIG_VZ_FAIRSCHED
+ struct fairsched_node *fsched_node;
+#endif
- unsigned long stack_start;
};
+ /* 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);
More information about the Kernel-svn-changes
mailing list