From 4cce8eb528330a2a3abb56bc74232aea89110bbe Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Tue, 31 May 2011 13:56:44 +0000 Subject: [PATCH] Update for earlier 330->350 patch: make it resemble the official 2.6.31 patch more closely, with thread_group_times function and cpuset_lock/unlock calls removed, plus lines (added by ToAsTcfh) to reset variables within rerun_prev_unlocked taken out as they are not required --- .../debian/patches/bfs-330-to-350.patch | 29 +++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/kernel-bfs-2.6.28/debian/patches/bfs-330-to-350.patch b/kernel-bfs-2.6.28/debian/patches/bfs-330-to-350.patch index 79fa2bf..ad90774 100644 --- a/kernel-bfs-2.6.28/debian/patches/bfs-330-to-350.patch +++ b/kernel-bfs-2.6.28/debian/patches/bfs-330-to-350.patch @@ -940,8 +940,8 @@ Index: kernel-2.6.28/kernel/sched_bfs.c - if (unlikely(reacquire_kernel_lock(current) < 0)) +rerun_prev_unlocked: + if (unlikely(reacquire_kernel_lock(current) < 0)) { -+ prev = rq->curr; -+ switch_count = &prev->nivcsw; ++// prev = rq->curr; ++// switch_count = &prev->nivcsw; goto need_resched_nonpreemptible; + } + @@ -972,15 +972,25 @@ Index: kernel-2.6.28/kernel/sched_bfs.c p->sched_reset_on_fork = reset_on_fork; queued = task_queued(p); -@@ -4453,7 +4564,7 @@ migration_call(struct notifier_block *nf +@@ -4444,7 +4556,6 @@ migration_call(struct notifier_block *nf + + case CPU_DEAD: + case CPU_DEAD_FROZEN: +- cpuset_lock(); /* around calls to cpuset_cpus_allowed_lock() */ + idle = rq->idle; + /* Idle task back to normal (off runqueue, low prio) */ + grq_lock_irq(); +@@ -4453,9 +4564,8 @@ migration_call(struct notifier_block *nf __setscheduler(idle, rq, SCHED_NORMAL, 0); idle->prio = PRIO_LIMIT; set_rq_task(rq, idle); - update_rq_clock(rq); + update_clocks(rq); grq_unlock_irq(); - cpuset_unlock(); +- cpuset_unlock(); break; + + case CPU_DYING: @@ -5982,12 +6093,14 @@ void __init sched_init(void) int i; struct rq *rq; @@ -1007,6 +1017,17 @@ Index: kernel-2.6.28/kernel/sched_bfs.c rq->sd = NULL; rq->rd = NULL; rq->online = 0; +@@ -6219,10 +6334,6 @@ cputime_t task_stime(struct task_struct + } + #endif + +-void thread_group_times(struct task_struct *p, cputime_t *ut, cputime_t *st) +-{ +-} +- + inline cputime_t task_gtime(struct task_struct *p) + { + return p->gtime; Index: kernel-2.6.28/kernel/sysctl.c =================================================================== --- kernel-2.6.28.orig/kernel/sysctl.c -- 1.7.9.5