[kernel] r12398 - dists/sid/linux-2.6/debian/patches/features/all/openvz
Dann Frazier
dannf at alioth.debian.org
Mon Nov 17 17:53:16 UTC 2008
Author: dannf
Date: Mon Nov 17 17:53:15 2008
New Revision: 12398
Log:
adjust to apply on top of 2.6.26.8-abi-1.patch, and move new scm_work_list field in task_struct below the fields added by openvz to maintain the openvz field offsets
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 (original)
+++ dists/sid/linux-2.6/debian/patches/features/all/openvz/openvz.patch Mon Nov 17 17:53:15 2008
@@ -25233,7 +25233,7 @@
/*
* Scheduling policies
*/
-@@ -90,6 +94,8 @@ struct sched_param {
+@@ -90,6 +94,8 @@
#include <asm/processor.h>
@@ -25242,7 +25242,7 @@
struct mem_cgroup;
struct exec_domain;
struct futex_pi_state;
-@@ -126,15 +132,38 @@ extern unsigned long avenrun[]; /* Load averages */
+@@ -126,15 +132,38 @@
load += n*(FIXED_1-exp); \
load >>= FSHIFT;
@@ -25281,7 +25281,7 @@
struct seq_file;
struct cfs_rq;
-@@ -269,6 +298,7 @@ static inline void show_state(void)
+@@ -269,6 +298,7 @@
}
extern void show_regs(struct pt_regs *);
@@ -25289,7 +25289,7 @@
/*
* TASK is a pointer to the task whose backtrace we want to see (or NULL for current
-@@ -423,6 +453,9 @@ struct pacct_struct {
+@@ -423,6 +453,9 @@
unsigned long ac_minflt, ac_majflt;
};
@@ -25299,7 +25299,7 @@
/*
* NOTE! "signal_struct" does not have it's own
* locking, because a shared signal_struct always
-@@ -1092,6 +1125,7 @@ struct task_struct {
+@@ -1092,6 +1125,7 @@
/* ??? */
unsigned int personality;
unsigned did_exec:1;
@@ -25307,7 +25307,7 @@
pid_t pid;
pid_t tgid;
-@@ -1289,6 +1323,14 @@ struct task_struct {
+@@ -1289,6 +1323,14 @@
struct rcu_head rcu;
/*
@@ -25322,10 +25322,11 @@
* cache last used pipe for splice
*/
struct pipe_inode_info *splice_pipe;
-@@ -1303,6 +1345,19 @@ struct task_struct {
+@@ -1303,7 +1345,19 @@
int latency_record_count;
struct latency_record latency_record[LT_SAVECOUNT];
#endif
+-
+#ifdef CONFIG_BEANCOUNTERS
+ struct task_beancounter task_bc;
+#endif
@@ -25339,10 +25340,10 @@
+#ifdef CONFIG_VZ_FAIRSCHED
+ struct fairsched_node *fsched_node;
+#endif
- };
-
- /*
-@@ -1477,6 +1532,43 @@
+ #ifndef __GENKSYMS__
+ struct list_head *scm_work_list;
+ #endif
+@@ -1485,6 +1539,43 @@
extern cputime_t task_stime(struct task_struct *p);
extern cputime_t task_gtime(struct task_struct *p);
@@ -25386,7 +25387,7 @@
/*
* Per process flags
*/
-@@ -1493,6 +1585,7 @@ static inline void put_task_struct(struct task_struct *t)
+@@ -1501,6 +1592,7 @@
#define PF_MEMALLOC 0x00000800 /* Allocating memory */
#define PF_FLUSHER 0x00001000 /* responsible for disk writeback */
#define PF_USED_MATH 0x00002000 /* if unset the fpu must be initialized before use */
@@ -25394,7 +25395,7 @@
#define PF_NOFREEZE 0x00008000 /* this thread should not be frozen */
#define PF_FROZEN 0x00010000 /* frozen for system suspend */
#define PF_FSTRANS 0x00020000 /* inside a filesystem transaction */
-@@ -1590,6 +1683,21 @@ extern unsigned long long cpu_clock(int cpu);
+@@ -1590,6 +1682,21 @@
extern unsigned long long
task_sched_runtime(struct task_struct *task);
@@ -25416,7 +25417,7 @@
/* sched_exec is called by processes performing an exec */
#ifdef CONFIG_SMP
extern void sched_exec(void);
-@@ -1727,6 +1835,7 @@ static inline struct user_struct *get_uid(struct user_struct *u)
+@@ -1727,6 +1834,7 @@
extern void free_uid(struct user_struct *);
extern void switch_uid(struct user_struct *);
extern void release_uids(struct user_namespace *ns);
@@ -25424,7 +25425,7 @@
#include <asm/current.h>
-@@ -1859,6 +1968,13 @@ extern int disallow_signal(int);
+@@ -1859,6 +1967,13 @@
extern int do_execve(char *, char __user * __user *, char __user * __user *, struct pt_regs *);
extern long do_fork(unsigned long, unsigned long, struct pt_regs *, unsigned long, int __user *, int __user *);
@@ -25438,7 +25439,7 @@
struct task_struct *fork_idle(int);
extern void set_task_comm(struct task_struct *tsk, char *from);
-@@ -1873,19 +1989,19 @@ extern void wait_task_inactive(struct task_struct * p);
+@@ -1873,19 +1988,19 @@
#define remove_parent(p) list_del_init(&(p)->sibling)
#define add_parent(p) list_add_tail(&(p)->sibling,&(p)->parent->children)
@@ -25464,7 +25465,7 @@
while ((t = next_thread(t)) != g)
/* de_thread depends on thread_group_leader not being a pid based check */
-@@ -1910,8 +2026,15 @@ int same_thread_group(struct task_struct *p1, struct task_struct *p2)
+@@ -1910,8 +2025,15 @@
static inline struct task_struct *next_thread(const struct task_struct *p)
{
@@ -25481,7 +25482,7 @@
}
static inline int thread_group_empty(struct task_struct *p)
-@@ -1951,6 +2074,98 @@ static inline void unlock_task_sighand(struct task_struct *tsk,
+@@ -1951,6 +2073,98 @@
spin_unlock_irqrestore(&tsk->sighand->siglock, *flags);
}
@@ -25580,8 +25581,6 @@
#ifndef __HAVE_THREAD_FUNCTIONS
#define task_thread_info(task) ((struct thread_info *)(task)->stack)
-diff --git a/include/linux/sem.h b/include/linux/sem.h
-index c8eaad9..380e1d1 100644
--- a/include/linux/sem.h
+++ b/include/linux/sem.h
@@ -154,6 +154,9 @@ static inline void exit_sem(struct task_struct *tsk)
More information about the Kernel-svn-changes
mailing list