packages (Titanium): kernel-desktop/kernel-desktop-sched-bfs.patch, kernel-...

cactus cactus at pld-linux.org
Fri Sep 4 00:50:01 CEST 2009


Author: cactus                       Date: Thu Sep  3 22:50:01 2009 GMT
Module: packages                      Tag: Titanium
---- Log message:
- bfs patch up to 204

---- Files affected:
packages/kernel-desktop:
   kernel-desktop-sched-bfs.patch (1.1 -> 1.1.2.1) , kernel-desktop.spec (1.204.2.53 -> 1.204.2.54) 

---- Diffs:

================================================================
Index: packages/kernel-desktop/kernel-desktop-sched-bfs.patch
diff -u packages/kernel-desktop/kernel-desktop-sched-bfs.patch:1.1 packages/kernel-desktop/kernel-desktop-sched-bfs.patch:1.1.2.1
--- packages/kernel-desktop/kernel-desktop-sched-bfs.patch:1.1	Thu Sep  3 10:06:38 2009
+++ packages/kernel-desktop/kernel-desktop-sched-bfs.patch	Fri Sep  4 00:49:55 2009
@@ -1,4 +1,4 @@
-The Brain Fuck Scheduler v0.203 by Con Kolivas.
+The Brain Fuck Scheduler v0.204 by Con Kolivas.
 
 A single shared runqueue O(n) strict fairness earliest deadline first design.
 
@@ -20,35 +20,35 @@
 schedtool -I -e amarok
 
 ---
- Documentation/sysctl/kernel.txt |   25 
- fs/pipe.c                       |    4 
- fs/proc/base.c                  |    2 
- include/linux/init_task.h       |   15 
- include/linux/ioprio.h          |    2 
- include/linux/sched.h           |  198 
- init/Kconfig                    |  173 
- kernel/Makefile                 |    4 
- kernel/delayacct.c              |    2 
- kernel/exit.c                   |    6 
- kernel/fork.c                   |    2 
- kernel/kthread.c                |    4 
- kernel/posix-cpu-timers.c       |   12 
+ Documentation/sysctl/kernel.txt |   25
+ fs/pipe.c                       |    4
+ fs/proc/base.c                  |    2
+ include/linux/init_task.h       |   15
+ include/linux/ioprio.h          |    2
+ include/linux/sched.h           |  193
+ init/Kconfig                    |   61
+ kernel/Makefile                 |    4
+ kernel/delayacct.c              |    2
+ kernel/exit.c                   |    6
+ kernel/fork.c                   |    2
+ kernel/kthread.c                |    4
+ kernel/posix-cpu-timers.c       |   12
  kernel/sched.c                  |10241 ----------------------------------------
- kernel/sched_bfs.c              | 5819 ++++++++++++++++++++++
+ kernel/sched_bfs.c              | 5837 ++++++++++++++++++++++
  kernel/sched_debug.c            |  509 -
  kernel/sched_fair.c             | 1835 -------
- kernel/sched_idletask.c         |  128 
+ kernel/sched_idletask.c         |  128
  kernel/sched_rt.c               | 1771 ------
- kernel/sysctl.c                 |  145 
- kernel/trace/trace.c            |    4 
- kernel/workqueue.c              |    2 
- mm/oom_kill.c                   |    2 
- 23 files changed, 5925 insertions(+), 14980 deletions(-)
+ kernel/sysctl.c                 |  145
+ kernel/trace/trace.c            |    4
+ kernel/workqueue.c              |    2
+ mm/oom_kill.c                   |    2
+ 23 files changed, 5940 insertions(+), 14866 deletions(-)
 
-Index: linux-2.6.30-test/Documentation/sysctl/kernel.txt
+Index: linux-2.6.30-bfs/Documentation/sysctl/kernel.txt
 ===================================================================
---- linux-2.6.30-test.orig/Documentation/sysctl/kernel.txt	2009-09-01 09:56:45.475824529 +1000
-+++ linux-2.6.30-test/Documentation/sysctl/kernel.txt	2009-09-01 09:57:21.504098535 +1000
+--- linux-2.6.30-bfs.orig/Documentation/sysctl/kernel.txt	2009-09-03 19:50:51.796053865 +1000
++++ linux-2.6.30-bfs/Documentation/sysctl/kernel.txt	2009-09-03 19:51:10.160055089 +1000
 @@ -27,6 +27,7 @@
  - domainname
  - hostname
@@ -66,9 +66,9 @@
  - rtsig-nr
  - sem
 @@ -170,6 +172,16 @@
- 
+
  ==============================================================
- 
+
 +iso_cpu:
 +
 +This sets the percentage cpu that the unprivileged SCHED_ISO tasks can
@@ -80,12 +80,12 @@
 +==============================================================
 +
  l2cr: (PPC only)
- 
+
  This flag controls the L2 cache of G3 processor boards. If
 @@ -322,6 +334,19 @@
- 
+
  ==============================================================
- 
+
 +rr_interval:
 +
 +This is the smallest duration that any cpu process scheduling unit
@@ -100,16 +100,16 @@
 +==============================================================
 +
  rtsig-max & rtsig-nr:
- 
+
  The file rtsig-max can be used to tune the maximum number
-Index: linux-2.6.30-test/fs/pipe.c
+Index: linux-2.6.30-bfs/fs/pipe.c
 ===================================================================
---- linux-2.6.30-test.orig/fs/pipe.c	2009-09-01 09:56:45.479826436 +1000
-+++ linux-2.6.30-test/fs/pipe.c	2009-09-01 09:57:21.505096986 +1000
+--- linux-2.6.30-bfs.orig/fs/pipe.c	2009-09-03 19:50:51.757054464 +1000
++++ linux-2.6.30-bfs/fs/pipe.c	2009-09-03 19:51:10.181054636 +1000
 @@ -78,10 +78,6 @@
  {
  	DEFINE_WAIT(wait);
- 
+
 -	/*
 -	 * Pipes are system-local resources, so sleeping on them
 -	 * is considered a noninteractive wait:
@@ -117,10 +117,10 @@
  	prepare_to_wait(&pipe->wait, &wait, TASK_INTERRUPTIBLE);
  	pipe_unlock(pipe);
  	schedule();
-Index: linux-2.6.30-test/include/linux/init_task.h
+Index: linux-2.6.30-bfs/include/linux/init_task.h
 ===================================================================
---- linux-2.6.30-test.orig/include/linux/init_task.h	2009-09-01 09:56:45.560826284 +1000
-+++ linux-2.6.30-test/include/linux/init_task.h	2009-09-01 09:57:21.505096986 +1000
+--- linux-2.6.30-bfs.orig/include/linux/init_task.h	2009-09-03 19:50:51.802053428 +1000
++++ linux-2.6.30-bfs/include/linux/init_task.h	2009-09-03 19:51:10.224053762 +1000
 @@ -119,21 +119,16 @@
  	.usage		= ATOMIC_INIT(2),				\
  	.flags		= PF_KTHREAD,					\
@@ -148,10 +148,10 @@
  	.tasks		= LIST_HEAD_INIT(tsk.tasks),			\
  	.pushable_tasks = PLIST_NODE_INIT(tsk.pushable_tasks, MAX_PRIO), \
  	.ptraced	= LIST_HEAD_INIT(tsk.ptraced),			\
-Index: linux-2.6.30-test/include/linux/sched.h
+Index: linux-2.6.30-bfs/include/linux/sched.h
 ===================================================================
---- linux-2.6.30-test.orig/include/linux/sched.h	2009-09-01 09:56:45.570847184 +1000
-+++ linux-2.6.30-test/include/linux/sched.h	2009-09-01 09:57:21.506111012 +1000
+--- linux-2.6.30-bfs.orig/include/linux/sched.h	2009-09-03 19:50:51.813054751 +1000
++++ linux-2.6.30-bfs/include/linux/sched.h	2009-09-03 23:38:22.267262950 +1000
 @@ -36,8 +36,11 @@
  #define SCHED_FIFO		1
  #define SCHED_RR		2
@@ -163,12 +163,12 @@
 +
 +#define SCHED_MAX		(SCHED_IDLEPRIO)
 +#define SCHED_RANGE(policy)	((policy) <= SCHED_MAX)
- 
+
  #ifdef __KERNEL__
- 
+
 @@ -141,13 +144,10 @@
  extern unsigned long get_parent_ip(unsigned long addr);
- 
+
  struct seq_file;
 -struct cfs_rq;
  struct task_group;
@@ -189,17 +189,17 @@
 -{
 -}
  #endif
- 
+
  extern unsigned long long time_sync_thresh;
 @@ -251,8 +247,8 @@
  extern void init_idle(struct task_struct *idle, int cpu);
  extern void init_idle_bootup_task(struct task_struct *idle);
- 
+
 -extern int runqueue_is_locked(void);
 -extern void task_rq_unlock_wait(struct task_struct *p);
 +extern int grunqueue_is_locked(void);
 +extern void grq_unlock_wait(void);
- 
+
  extern cpumask_var_t nohz_cpu_mask;
  #if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ)
 @@ -969,151 +965,9 @@
@@ -209,7 +209,7 @@
 -
  struct rq;
  struct sched_domain;
- 
+
 -struct sched_class {
 -	const struct sched_class *next;
 -
@@ -355,9 +355,9 @@
  	volatile long state;	/* -1 unrunnable, 0 runnable, >0 stopped */
  	void *stack;
 @@ -1123,17 +977,18 @@
- 
+
  	int lock_depth;		/* BKL lock depth */
- 
+
 -#ifdef CONFIG_SMP
 -#ifdef __ARCH_WANT_UNLOCKED_CTXSW
  	int oncpu;
@@ -378,17 +378,17 @@
 +
 +	int rt_nr_cpus_allowed;
 +	unsigned long rt_timeout;
- 
+
  #ifdef CONFIG_PREEMPT_NOTIFIERS
  	/* list of struct preempt_notifier: */
 @@ -1156,6 +1011,9 @@
- 
+
  	unsigned int policy;
  	cpumask_t cpus_allowed;
 +#ifdef CONFIG_HOTPLUG_CPU
 +	cpumask_t unplugged_mask;
 +#endif
- 
+
  #ifdef CONFIG_PREEMPT_RCU
  	int rcu_read_lock_nesting;
 @@ -1446,11 +1304,14 @@
@@ -407,36 +407,25 @@
 +#define IDLE_PRIO		(MAX_RT_PRIO + 2)
 +#define PRIO_LIMIT		((IDLE_PRIO) + 1)
  #define DEFAULT_PRIO		(MAX_RT_PRIO + 20)
- 
+
  static inline int rt_prio(int prio)
 @@ -1733,11 +1594,7 @@
  extern unsigned long long thread_group_sched_runtime(struct task_struct *task);
- 
+
  /* sched_exec is called by processes performing an exec */
 -#ifdef CONFIG_SMP
 -extern void sched_exec(void);
 -#else
  #define sched_exec()   {}
 -#endif
- 
+
  extern void sched_clock_idle_sleep_event(void);
  extern void sched_clock_idle_wakeup_event(u64 delta_ns);
-@@ -2283,7 +2140,10 @@
- 	return task_thread_info(p)->cpu;
- }
- 
--extern void set_task_cpu(struct task_struct *p, unsigned int cpu);
-+static inline void set_task_cpu(struct task_struct *p, unsigned int cpu)
-+{
-+	task_thread_info(p)->cpu = cpu;
-+}
- 
- #else
- 
-Index: linux-2.6.30-test/kernel/sysctl.c
+Index: linux-2.6.30-bfs/kernel/sched.c
+===================================================================
 ===================================================================
---- linux-2.6.30-test.orig/kernel/sysctl.c	2009-09-01 09:56:45.546847267 +1000
-+++ linux-2.6.30-test/kernel/sysctl.c	2009-09-01 09:57:21.516097550 +1000
+--- linux-2.6.30-bfs.orig/kernel/sysctl.c	2009-09-03 19:50:51.867053380 +1000
++++ linux-2.6.30-bfs/kernel/sysctl.c	2009-09-03 19:51:10.311054330 +1000
 @@ -83,6 +83,8 @@
  extern int compat_log;
  extern int latencytop_enabled;
@@ -448,7 +437,7 @@
  #endif
 @@ -97,10 +99,11 @@
  #endif
- 
+
  static int zero;
 -static int __maybe_unused one = 1;
  static int __maybe_unused two = 2;
@@ -457,13 +446,13 @@
 +static int __read_mostly one = 1;
 +static int __read_mostly one_hundred = 100;
 +static int __read_mostly five_thousand = 5000;
- 
+
  /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
  static unsigned long dirty_bytes_min = 2 * PAGE_SIZE;
 @@ -234,123 +237,7 @@
  	{ .ctl_name = 0 }
  };
- 
+
 -#ifdef CONFIG_SCHED_DEBUG
 -static int min_sched_granularity_ns = 100000;		/* 100 usecs */
 -static int max_sched_granularity_ns = NSEC_PER_SEC;	/* 1 second */
@@ -613,22 +602,22 @@
  #if defined(CONFIG_S390) && defined(CONFIG_SMP)
  	{
  		.ctl_name	= KERN_SPIN_RETRY,
-Index: linux-2.6.30-test/kernel/workqueue.c
+Index: linux-2.6.30-bfs/kernel/workqueue.c
 ===================================================================
---- linux-2.6.30-test.orig/kernel/workqueue.c	2009-09-01 09:56:45.551828838 +1000
-+++ linux-2.6.30-test/kernel/workqueue.c	2009-09-01 09:57:21.516097550 +1000
+--- linux-2.6.30-bfs.orig/kernel/workqueue.c	2009-09-03 19:50:51.895053538 +1000
++++ linux-2.6.30-bfs/kernel/workqueue.c	2009-09-03 19:51:10.366061008 +1000
 @@ -320,8 +320,6 @@
  	if (cwq->wq->freezeable)
  		set_freezable();
- 
+
 -	set_user_nice(current, -5);
 -
  	for (;;) {
  		prepare_to_wait(&cwq->more_work, &wait, TASK_INTERRUPTIBLE);
  		if (!freezing(current) &&
-Index: linux-2.6.30-test/kernel/sched_fair.c
+Index: linux-2.6.30-bfs/kernel/sched_fair.c
 ===================================================================
---- linux-2.6.30-test.orig/kernel/sched_fair.c	2009-09-01 09:56:45.514848636 +1000
+--- linux-2.6.30-bfs.orig/kernel/sched_fair.c	2009-09-03 19:50:51.837054274 +1000
 +++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,1835 +0,0 @@
 -/*
@@ -2466,9 +2455,9 @@
 -	rcu_read_unlock();
 -}
 -#endif
-Index: linux-2.6.30-test/kernel/sched_idletask.c
+Index: linux-2.6.30-bfs/kernel/sched_idletask.c
 ===================================================================
---- linux-2.6.30-test.orig/kernel/sched_idletask.c	2009-09-01 09:56:45.518824632 +1000
+--- linux-2.6.30-bfs.orig/kernel/sched_idletask.c	2009-09-03 19:50:51.819053823 +1000
 +++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,128 +0,0 @@
 -/*
@@ -2599,11 +2588,12 @@
 -
 -	/* no .task_new for idle tasks */
 -};
-Index: linux-2.6.30-test/kernel/sched_bfs.c
+Index: linux-2.6.30-bfs/kernel/sched_rt.c
+===================================================================
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.30-test/kernel/sched_bfs.c	2009-09-02 16:59:49.999070923 +1000
-@@ -0,0 +1,5819 @@
++++ linux-2.6.30-bfs/kernel/sched_bfs.c	2009-09-03 23:38:22.315260641 +1000
+@@ -0,0 +1,5837 @@
 +/*
 + *  kernel/sched_bfs.c, was sched.c
 + *
@@ -3248,6 +3238,20 @@
 +	grq.nr_running--;
 +}
 +
++#ifdef CONFIG_SMP
++void set_task_cpu(struct task_struct *p, unsigned int cpu)
++{
++	trace_sched_migrate_task(p, task_cpu(p), cpu);
++	/*
++	 * After ->cpu is set up to a new value, task_grq_lock(p, ...) can be
++	 * successfuly executed on another CPU. We must ensure that updates of
++	 * per-task data have been completed by this moment.
++	 */
++	smp_wmb();
++	task_thread_info(p)->cpu = cpu;
++}
++#endif
++
 +/*
 + * Move a task off the global queue and take it to a cpu for it will
 + * become the running task.
@@ -3579,6 +3583,7 @@
 +	success = 1;
 +
 +out_running:
++	trace_sched_wakeup(rq, p, success);
 +	p->state = TASK_RUNNING;
 +out_unlock:
 +	task_grq_unlock(&flags);
@@ -3680,6 +3685,7 @@
 +	set_task_cpu(p, task_cpu(parent));
 +
 +	activate_task(p);
++	trace_sched_wakeup_new(rq, p, 1);
 +	if (!(clone_flags & CLONE_VM) && rq->curr == parent) {
 +		/*
 +		 * The VM isn't cloned, so we're in a good position to
@@ -3880,6 +3886,7 @@
 +	struct mm_struct *mm, *oldmm;
 +
 +	prepare_task_switch(rq, prev, next);
++	trace_sched_switch(rq, prev, next);
 +	mm = next->mm;
 +	oldmm = prev->active_mm;
 +	/*
@@ -6180,6 +6187,7 @@
 +#else
 +	task_thread_info(idle)->preempt_count = 0;
 +#endif
++	ftrace_graph_init_task(idle);
 +}
 +
 +/*
@@ -8423,14 +8431,14 @@
 +void proc_sched_set_task(struct task_struct *p)
 +{}
 +#endif
-Index: linux-2.6.30-test/kernel/Makefile
+Index: linux-2.6.30-bfs/kernel/Makefile
 ===================================================================
---- linux-2.6.30-test.orig/kernel/Makefile	2009-09-01 09:56:45.530824764 +1000
-+++ linux-2.6.30-test/kernel/Makefile	2009-09-01 09:57:21.523096626 +1000
+--- linux-2.6.30-bfs.orig/kernel/Makefile	2009-09-03 19:50:51.884053555 +1000
++++ linux-2.6.30-bfs/kernel/Makefile	2009-09-03 19:51:10.440054501 +1000
 @@ -2,7 +2,7 @@
  # Makefile for the linux kernel.
  #
- 
+
 -obj-y     = sched.o fork.o exec_domain.o panic.o printk.o \
 +obj-y     = sched_bfs.o fork.o exec_domain.o panic.o printk.o \
  	    cpu.o exit.o itimer.o time.o softirq.o resource.o \
@@ -8443,19 +8451,19 @@
 -CFLAGS_sched.o := $(PROFILING) -fno-omit-frame-pointer
 +CFLAGS_sched_bfs.o := $(PROFILING) -fno-omit-frame-pointer
  endif
- 
+
  $(obj)/configs.o: $(obj)/config_data.h
-Index: linux-2.6.30-test/kernel/kthread.c
+Index: linux-2.6.30-bfs/kernel/kthread.c
 ===================================================================
---- linux-2.6.30-test.orig/kernel/kthread.c	2009-09-01 09:56:45.501827005 +1000
-+++ linux-2.6.30-test/kernel/kthread.c	2009-09-01 09:57:21.524102481 +1000
+--- linux-2.6.30-bfs.orig/kernel/kthread.c	2009-09-03 19:50:51.889054297 +1000
++++ linux-2.6.30-bfs/kernel/kthread.c	2009-09-03 19:51:10.490053542 +1000
 @@ -15,7 +15,7 @@
  #include <linux/mutex.h>
  #include <trace/sched.h>
- 
+
 -#define KTHREAD_NICE_LEVEL (-5)
 +#define KTHREAD_NICE_LEVEL (0)
- 
+
  static DEFINE_SPINLOCK(kthread_create_lock);
  static LIST_HEAD(kthread_create_list);
 @@ -180,7 +180,7 @@
@@ -8467,17 +8475,17 @@
  	k->flags |= PF_THREAD_BOUND;
  }
  EXPORT_SYMBOL(kthread_bind);
-Index: linux-2.6.30-test/kernel/posix-cpu-timers.c
+Index: linux-2.6.30-bfs/kernel/posix-cpu-timers.c
 ===================================================================
---- linux-2.6.30-test.orig/kernel/posix-cpu-timers.c	2009-09-01 09:56:45.526848350 +1000
-+++ linux-2.6.30-test/kernel/posix-cpu-timers.c	2009-09-01 09:57:21.525102957 +1000
+--- linux-2.6.30-bfs.orig/kernel/posix-cpu-timers.c	2009-09-03 19:50:51.857053341 +1000
++++ linux-2.6.30-bfs/kernel/posix-cpu-timers.c	2009-09-03 19:51:10.540060771 +1000
 @@ -249,7 +249,7 @@
  	do {
  		times->utime = cputime_add(times->utime, t->utime);
  		times->stime = cputime_add(times->stime, t->stime);
 -		times->sum_exec_runtime += t->se.sum_exec_runtime;
 +		times->sum_exec_runtime += t->sched_time;
- 
+
  		t = next_thread(t);
  	} while (t != tsk);
 @@ -516,7 +516,7 @@
@@ -8486,7 +8494,7 @@
  	cleanup_timers(tsk->cpu_timers,
 -		       tsk->utime, tsk->stime, tsk->se.sum_exec_runtime);
 +		       tsk->utime, tsk->stime, tsk->sched_time);
- 
+
  }
  void posix_cpu_timers_exit_group(struct task_struct *tsk)
 @@ -1016,7 +1016,7 @@
@@ -8500,7 +8508,7 @@
  		}
 @@ -1032,7 +1032,7 @@
  		unsigned long *soft = &sig->rlim[RLIMIT_RTTIME].rlim_cur;
- 
+
  		if (hard != RLIM_INFINITY &&
 -		    tsk->rt.timeout > DIV_ROUND_UP(hard, USEC_PER_SEC/HZ)) {
 +		    tsk->rt_timeout > DIV_ROUND_UP(hard, USEC_PER_SEC/HZ)) {
@@ -8523,12 +8531,12 @@
 -			.sum_exec_runtime = tsk->se.sum_exec_runtime
 +			.sum_exec_runtime = tsk->sched_time
  		};
- 
+
  		if (task_cputime_expired(&task_sample, &tsk->cputime_expires))
-Index: linux-2.6.30-test/kernel/exit.c
+Index: linux-2.6.30-bfs/kernel/exit.c
 ===================================================================
---- linux-2.6.30-test.orig/kernel/exit.c	2009-09-01 09:56:45.505848397 +1000
-+++ linux-2.6.30-test/kernel/exit.c	2009-09-01 09:57:21.527091060 +1000
+--- linux-2.6.30-bfs.orig/kernel/exit.c	2009-09-03 19:50:51.872054089 +1000
++++ linux-2.6.30-bfs/kernel/exit.c	2009-09-03 19:51:10.607063074 +1000
 @@ -124,7 +124,7 @@
  		sig->inblock += task_io_get_inblock(tsk);
  		sig->oublock += task_io_get_oublock(tsk);
@@ -8537,7 +8545,7 @@
 +		sig->sum_sched_runtime += tsk->sched_time;
  		sig = NULL; /* Marker for below. */
  	}
- 
+
 @@ -146,10 +146,10 @@
  		flush_sigqueue(&sig->shared_pending);
  		taskstats_tgid_free(sig);
@@ -8551,10 +8559,10 @@
  		__cleanup_signal(sig);
  	}
  }
-Index: linux-2.6.30-test/kernel/fork.c
+Index: linux-2.6.30-bfs/kernel/fork.c
 ===================================================================
---- linux-2.6.30-test.orig/kernel/fork.c	2009-09-01 09:56:45.535847891 +1000
-+++ linux-2.6.30-test/kernel/fork.c	2009-09-01 09:57:21.528097124 +1000
+--- linux-2.6.30-bfs.orig/kernel/fork.c	2009-09-03 19:50:51.862053392 +1000
++++ linux-2.6.30-bfs/kernel/fork.c	2009-09-03 19:51:10.665056329 +1000
 @@ -1204,7 +1204,7 @@
  	 * parent's CPU). This avoids alot of nasty races.
  	 */
@@ -8564,10 +8572,10 @@
  	if (unlikely(!cpu_isset(task_cpu(p), p->cpus_allowed) ||
  			!cpu_online(task_cpu(p))))
  		set_task_cpu(p, smp_processor_id());
-Index: linux-2.6.30-test/mm/oom_kill.c
+Index: linux-2.6.30-bfs/mm/oom_kill.c
 ===================================================================
---- linux-2.6.30-test.orig/mm/oom_kill.c	2009-09-01 09:56:45.489848034 +1000
-+++ linux-2.6.30-test/mm/oom_kill.c	2009-09-01 09:57:21.529103188 +1000
+--- linux-2.6.30-bfs.orig/mm/oom_kill.c	2009-09-03 19:50:51.901054980 +1000
++++ linux-2.6.30-bfs/mm/oom_kill.c	2009-09-03 19:51:10.731054188 +1000
 @@ -338,7 +338,7 @@
  	 * all the memory it needs. That way it should be able to
  	 * exit() and clear out its resources quickly...
@@ -8575,16 +8583,16 @@
 -	p->rt.time_slice = HZ;
 +	p->time_slice = HZ;
  	set_tsk_thread_flag(p, TIF_MEMDIE);
- 
+
  	force_sig(SIGKILL, p);
-Index: linux-2.6.30-test/init/Kconfig
+Index: linux-2.6.30-bfs/init/Kconfig
 ===================================================================
---- linux-2.6.30-test.orig/init/Kconfig	2009-09-01 09:56:45.556824377 +1000
-+++ linux-2.6.30-test/init/Kconfig	2009-09-01 09:57:21.530824916 +1000
-@@ -435,179 +435,6 @@
+--- linux-2.6.30-bfs.orig/init/Kconfig	2009-09-03 19:50:51.914054644 +1000
++++ linux-2.6.30-bfs/init/Kconfig	2009-09-03 23:38:22.334259229 +1000
+@@ -435,65 +435,13 @@
  config HAVE_UNSTABLE_SCHED_CLOCK
  	bool
- 
+
 -config GROUP_SCHED
 -	bool "Group CPU scheduler"
 -	depends on EXPERIMENTAL
@@ -8636,71 +8644,22 @@
 -
 -endchoice
 -
--menuconfig CGROUPS
--	boolean "Control Group support"
--	help
--	  This option adds support for grouping sets of processes together, for
+ menuconfig CGROUPS
+ 	boolean "Control Group support"
+ 	help
+ 	  This option adds support for grouping sets of processes together, for
 -	  use with process control subsystems such as Cpusets, CFS, memory
--	  controls or device isolation.
--	  See
++	  use with process control subsystems such as Cpusets, memory
+ 	  controls or device isolation.
+ 	  See
 -		- Documentation/scheduler/sched-design-CFS.txt	(CFS)
--		- Documentation/cgroups/ (features for grouping, isolation
--					  and resource control)
--
--	  Say N if unsure.
--
--if CGROUPS
--
--config CGROUP_DEBUG
--	bool "Example debug cgroup subsystem"
--	depends on CGROUPS
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-desktop/kernel-desktop-sched-bfs.patch?r1=1.1&r2=1.1.2.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-desktop/kernel-desktop.spec?r1=1.204.2.53&r2=1.204.2.54&f=u



More information about the pld-cvs-commit mailing list