diff options
| author | Ben Hutchings <benh@debian.org> | 2010-05-28 23:32:11 +0000 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2010-05-28 23:32:11 +0000 |
| commit | 20e78ebf7eb198222050142ff69418312b73e1e2 (patch) | |
| tree | 8c0fd53e307a1ed06674483909bc1282aa133cb8 /debian | |
| parent | dac251353f77fa9df2c3568fca8e7f1aa2164a69 (diff) | |
| download | kernel_replicant_linux-20e78ebf7eb198222050142ff69418312b73e1e2.tar.gz kernel_replicant_linux-20e78ebf7eb198222050142ff69418312b73e1e2.tar.bz2 kernel_replicant_linux-20e78ebf7eb198222050142ff69418312b73e1e2.zip | |
Fix-up openvz.patch again to avoid ABI change
svn path=/dists/sid/linux-2.6/; revision=15803
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/features/all/openvz/openvz.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/patches/features/all/openvz/openvz.patch b/debian/patches/features/all/openvz/openvz.patch index 6d934d0cee2b..368e15f54c8f 100644 --- a/debian/patches/features/all/openvz/openvz.patch +++ b/debian/patches/features/all/openvz/openvz.patch @@ -34331,9 +34331,9 @@ index b253434..1412d9a 100644 */ 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 @@ index b253434..1412d9a 100644 +#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); |