linux: update to linux-2.6.37.1

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2011-02-18 21:23:03 +01:00
parent fce7385e58
commit 0a8ed30135
38 changed files with 290 additions and 249 deletions

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="linux"
PKG_VERSION="2.6.37"
PKG_VERSION="2.6.37.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -1,19 +0,0 @@
diff -Naur linux-2.6.37-old/drivers/usb/core/hcd.c linux-2.6.37-new/drivers/usb/core/hcd.c
--- linux-2.6.37-old/drivers/usb/core/hcd.c 2011-01-04 16:50:19.000000000 -0800
+++ linux-2.6.37-new/drivers/usb/core/hcd.c 2011-01-30 20:06:09.000000000 -0800
@@ -1956,7 +1956,6 @@
dev_dbg(&rhdev->dev, "usb %s%s\n",
(msg.event & PM_EVENT_AUTO ? "auto-" : ""), "resume");
- clear_bit(HCD_FLAG_WAKEUP_PENDING, &hcd->flags);
if (!hcd->driver->bus_resume)
return -ENOENT;
if (hcd->state == HC_STATE_RUNNING)
@@ -1964,6 +1963,7 @@
hcd->state = HC_STATE_RESUMING;
status = hcd->driver->bus_resume(hcd);
+ clear_bit(HCD_FLAG_WAKEUP_PENDING, &hcd->flags);
if (status == 0) {
/* TRSMRCY = 10 msec */
msleep(10);

View File

@ -1,8 +1,8 @@
http://www.kernel.org/pub/linux/kernel/people/ck/patches/2.6/2.6.37/2.6.37-ck1/patches/
2.6.37-sched-bfs-363.patch
2637-bfs363-nonhotplug_fix.patch
sched-add-above-background-load-function.patch
mm-make_swappiness_really_mean_it.patch
mm-zero_swappiness.patch
mm-enable_swaptoken_only_when_swap_full.patch
mm-drop_swap_cache_aggressively.patch
@ -17,4 +17,4 @@ hz-no_default_250.patch
hz-raise_max.patch
preempt-desktop-tune.patch
cpufreq-bfs_tweaks.patch
ck1-version.patch
ck2-version.patch

View File

@ -46,11 +46,11 @@ cpu usage may be very different if you have very short lived tasks.
lib/Kconfig.debug | 2
18 files changed, 7812 insertions(+), 27 deletions(-)
Index: linux-2.6.37-ck1/arch/powerpc/platforms/cell/spufs/sched.c
Index: linux-2.6.37-ck2/arch/powerpc/platforms/cell/spufs/sched.c
===================================================================
--- linux-2.6.37-ck1.orig/arch/powerpc/platforms/cell/spufs/sched.c 2010-05-17 18:51:19.000000000 +1000
+++ linux-2.6.37-ck1/arch/powerpc/platforms/cell/spufs/sched.c 2011-01-06 14:07:00.646901367 +1100
@@ -64,11 +64,6 @@ static struct timer_list spusched_timer;
--- linux-2.6.37-ck2.orig/arch/powerpc/platforms/cell/spufs/sched.c 2010-05-17 18:51:19.000000000 +1000
+++ linux-2.6.37-ck2/arch/powerpc/platforms/cell/spufs/sched.c 2011-02-14 09:47:50.982252001 +1100
@@ -64,11 +64,6 @@
static struct timer_list spuloadavg_timer;
/*
@ -62,10 +62,10 @@ Index: linux-2.6.37-ck1/arch/powerpc/platforms/cell/spufs/sched.c
* Frequency of the spu scheduler tick. By default we do one SPU scheduler
* tick for every 10 CPU scheduler ticks.
*/
Index: linux-2.6.37-ck1/Documentation/scheduler/sched-BFS.txt
Index: linux-2.6.37-ck2/Documentation/scheduler/sched-BFS.txt
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.37-ck1/Documentation/scheduler/sched-BFS.txt 2011-01-06 14:07:00.647901426 +1100
+++ linux-2.6.37-ck2/Documentation/scheduler/sched-BFS.txt 2011-02-14 09:47:50.984252001 +1100
@@ -0,0 +1,351 @@
+BFS - The Brain Fuck Scheduler by Con Kolivas.
+
@ -418,11 +418,11 @@ Index: linux-2.6.37-ck1/Documentation/scheduler/sched-BFS.txt
+
+
+Con Kolivas <kernel@kolivas.org> Fri Aug 27 2010
Index: linux-2.6.37-ck1/Documentation/sysctl/kernel.txt
Index: linux-2.6.37-ck2/Documentation/sysctl/kernel.txt
===================================================================
--- linux-2.6.37-ck1.orig/Documentation/sysctl/kernel.txt 2011-01-06 14:04:07.607634467 +1100
+++ linux-2.6.37-ck1/Documentation/sysctl/kernel.txt 2011-01-06 14:07:00.647901426 +1100
@@ -32,6 +32,7 @@ show up in /proc/sys/kernel:
--- linux-2.6.37-ck2.orig/Documentation/sysctl/kernel.txt 2011-01-06 14:04:07.000000000 +1100
+++ linux-2.6.37-ck2/Documentation/sysctl/kernel.txt 2011-02-14 09:47:50.984252001 +1100
@@ -32,6 +32,7 @@
- domainname
- hostname
- hotplug
@ -430,7 +430,7 @@ Index: linux-2.6.37-ck1/Documentation/sysctl/kernel.txt
- java-appletviewer [ binfmt_java, obsolete ]
- java-interpreter [ binfmt_java, obsolete ]
- kstack_depth_to_print [ X86 only ]
@@ -54,6 +55,7 @@ show up in /proc/sys/kernel:
@@ -54,6 +55,7 @@
- randomize_va_space
- real-root-dev ==> Documentation/initrd.txt
- reboot-cmd [ SPARC only ]
@ -438,7 +438,7 @@ Index: linux-2.6.37-ck1/Documentation/sysctl/kernel.txt
- rtsig-max
- rtsig-nr
- sem
@@ -254,6 +256,16 @@ Default value is "/sbin/hotplug".
@@ -254,6 +256,16 @@
==============================================================
@ -455,7 +455,7 @@ Index: linux-2.6.37-ck1/Documentation/sysctl/kernel.txt
l2cr: (PPC only)
This flag controls the L2 cache of G3 processor boards. If
@@ -428,6 +440,20 @@ rebooting. ???
@@ -428,6 +440,20 @@
==============================================================
@ -476,11 +476,11 @@ Index: linux-2.6.37-ck1/Documentation/sysctl/kernel.txt
rtsig-max & rtsig-nr:
The file rtsig-max can be used to tune the maximum number
Index: linux-2.6.37-ck1/fs/proc/base.c
Index: linux-2.6.37-ck2/fs/proc/base.c
===================================================================
--- linux-2.6.37-ck1.orig/fs/proc/base.c 2011-01-06 14:04:10.387799279 +1100
+++ linux-2.6.37-ck1/fs/proc/base.c 2011-01-06 14:07:00.647901426 +1100
@@ -356,7 +356,7 @@ static int proc_pid_stack(struct seq_fil
--- linux-2.6.37-ck2.orig/fs/proc/base.c 2011-01-06 14:04:10.000000000 +1100
+++ linux-2.6.37-ck2/fs/proc/base.c 2011-02-14 09:47:50.986252000 +1100
@@ -356,7 +356,7 @@
static int proc_pid_schedstat(struct task_struct *task, char *buffer)
{
return sprintf(buffer, "%llu %llu %lu\n",
@ -489,11 +489,11 @@ Index: linux-2.6.37-ck1/fs/proc/base.c
(unsigned long long)task->sched_info.run_delay,
task->sched_info.pcount);
}
Index: linux-2.6.37-ck1/include/linux/init_task.h
Index: linux-2.6.37-ck2/include/linux/init_task.h
===================================================================
--- linux-2.6.37-ck1.orig/include/linux/init_task.h 2011-01-06 14:04:10.453803192 +1100
+++ linux-2.6.37-ck1/include/linux/init_task.h 2011-01-06 14:07:00.648901485 +1100
@@ -114,6 +114,67 @@ extern struct cred init_cred;
--- linux-2.6.37-ck2.orig/include/linux/init_task.h 2011-01-06 14:04:10.000000000 +1100
+++ linux-2.6.37-ck2/include/linux/init_task.h 2011-02-14 09:47:50.986252001 +1100
@@ -114,6 +114,67 @@
* INIT_TASK is used to set up the first task table, touch at
* your own risk!. Base=0, limit=0x1fffff (=2MB)
*/
@ -561,7 +561,7 @@ Index: linux-2.6.37-ck1/include/linux/init_task.h
#define INIT_TASK(tsk) \
{ \
.state = 0, \
@@ -179,7 +240,7 @@ extern struct cred init_cred;
@@ -179,7 +240,7 @@
INIT_TRACE_RECURSION \
INIT_TASK_RCU_PREEMPT(tsk) \
}
@ -570,11 +570,11 @@ Index: linux-2.6.37-ck1/include/linux/init_task.h
#define INIT_CPU_TIMERS(cpu_timers) \
{ \
Index: linux-2.6.37-ck1/include/linux/ioprio.h
Index: linux-2.6.37-ck2/include/linux/ioprio.h
===================================================================
--- linux-2.6.37-ck1.orig/include/linux/ioprio.h 2009-06-10 13:05:27.000000000 +1000
+++ linux-2.6.37-ck1/include/linux/ioprio.h 2011-01-06 14:07:00.648901485 +1100
@@ -64,6 +64,8 @@ static inline int task_ioprio_class(stru
--- linux-2.6.37-ck2.orig/include/linux/ioprio.h 2009-06-10 13:05:27.000000000 +1000
+++ linux-2.6.37-ck2/include/linux/ioprio.h 2011-02-14 09:47:50.986252001 +1100
@@ -64,6 +64,8 @@
static inline int task_nice_ioprio(struct task_struct *task)
{
@ -583,10 +583,10 @@ Index: linux-2.6.37-ck1/include/linux/ioprio.h
return (task_nice(task) + 20) / 5;
}
Index: linux-2.6.37-ck1/include/linux/sched.h
Index: linux-2.6.37-ck2/include/linux/sched.h
===================================================================
--- linux-2.6.37-ck1.orig/include/linux/sched.h 2011-01-06 14:04:10.485805089 +1100
+++ linux-2.6.37-ck1/include/linux/sched.h 2011-01-06 14:07:00.648901485 +1100
--- linux-2.6.37-ck2.orig/include/linux/sched.h 2011-01-06 14:04:10.000000000 +1100
+++ linux-2.6.37-ck2/include/linux/sched.h 2011-02-14 09:47:50.988252000 +1100
@@ -36,8 +36,15 @@
#define SCHED_FIFO 1
#define SCHED_RR 2
@ -604,7 +604,7 @@ Index: linux-2.6.37-ck1/include/linux/sched.h
/* Can be ORed in to make sure the process is reverted back to SCHED_NORMAL on fork */
#define SCHED_RESET_ON_FORK 0x40000000
@@ -268,8 +275,6 @@ extern asmlinkage void schedule_tail(str
@@ -268,8 +275,6 @@
extern void init_idle(struct task_struct *idle, int cpu);
extern void init_idle_bootup_task(struct task_struct *idle);
@ -613,7 +613,7 @@ Index: linux-2.6.37-ck1/include/linux/sched.h
extern cpumask_var_t nohz_cpu_mask;
#if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ)
extern void select_nohz_load_balancer(int stop_tick);
@@ -1188,17 +1193,31 @@ struct task_struct {
@@ -1188,17 +1193,31 @@
int lock_depth; /* BKL lock depth */
@ -645,7 +645,7 @@ Index: linux-2.6.37-ck1/include/linux/sched.h
#ifdef CONFIG_PREEMPT_NOTIFIERS
/* list of struct preempt_notifier: */
@@ -1295,6 +1314,9 @@ struct task_struct {
@@ -1295,6 +1314,9 @@
int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
cputime_t utime, stime, utimescaled, stimescaled;
@ -655,7 +655,7 @@ Index: linux-2.6.37-ck1/include/linux/sched.h
cputime_t gtime;
#ifndef CONFIG_VIRT_CPU_ACCOUNTING
cputime_t prev_utime, prev_stime;
@@ -1514,6 +1536,53 @@ struct task_struct {
@@ -1514,6 +1536,53 @@
#endif
};
@ -709,7 +709,7 @@ Index: linux-2.6.37-ck1/include/linux/sched.h
/* Future-safe accessor for struct task_struct's cpus_allowed. */
#define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
@@ -1531,10 +1600,20 @@ struct task_struct {
@@ -1531,10 +1600,20 @@
*/
#define MAX_USER_RT_PRIO 100
@ -732,7 +732,7 @@ Index: linux-2.6.37-ck1/include/linux/sched.h
static inline int rt_prio(int prio)
{
@@ -1862,7 +1941,7 @@ task_sched_runtime(struct task_struct *t
@@ -1862,7 +1941,7 @@
extern unsigned long long thread_group_sched_runtime(struct task_struct *task);
/* sched_exec is called by processes performing an exec */
@ -741,11 +741,11 @@ Index: linux-2.6.37-ck1/include/linux/sched.h
extern void sched_exec(void);
#else
#define sched_exec() {}
Index: linux-2.6.37-ck1/init/Kconfig
Index: linux-2.6.37-ck2/init/Kconfig
===================================================================
--- linux-2.6.37-ck1.orig/init/Kconfig 2011-01-06 14:04:10.526807520 +1100
+++ linux-2.6.37-ck1/init/Kconfig 2011-01-06 14:07:00.648901485 +1100
@@ -30,6 +30,19 @@ config IRQ_WORK
--- linux-2.6.37-ck2.orig/init/Kconfig 2011-01-06 14:04:10.000000000 +1100
+++ linux-2.6.37-ck2/init/Kconfig 2011-02-14 09:47:50.988252001 +1100
@@ -30,6 +30,19 @@
menu "General setup"
@ -765,7 +765,7 @@ Index: linux-2.6.37-ck1/init/Kconfig
config EXPERIMENTAL
bool "Prompt for development and/or incomplete code/drivers"
---help---
@@ -563,6 +576,7 @@ config PROC_PID_CPUSET
@@ -563,6 +576,7 @@
config CGROUP_CPUACCT
bool "Simple CPU accounting cgroup subsystem"
@ -773,7 +773,7 @@ Index: linux-2.6.37-ck1/init/Kconfig
help
Provides a simple Resource Controller for monitoring the
total CPU consumed by the tasks in a cgroup.
@@ -629,7 +643,7 @@ config CGROUP_MEM_RES_CTLR_SWAP_ENABLED
@@ -629,7 +643,7 @@
menuconfig CGROUP_SCHED
bool "Group CPU scheduler"
@ -782,11 +782,11 @@ Index: linux-2.6.37-ck1/init/Kconfig
default n
help
This feature lets CPU scheduler recognize task groups and control CPU
Index: linux-2.6.37-ck1/init/main.c
Index: linux-2.6.37-ck2/init/main.c
===================================================================
--- linux-2.6.37-ck1.orig/init/main.c 2011-01-06 14:04:10.527807579 +1100
+++ linux-2.6.37-ck1/init/main.c 2011-01-06 14:07:00.649901545 +1100
@@ -824,6 +824,7 @@ static noinline int init_post(void)
--- linux-2.6.37-ck2.orig/init/main.c 2011-01-06 14:04:10.000000000 +1100
+++ linux-2.6.37-ck2/init/main.c 2011-02-14 09:47:50.989252001 +1100
@@ -824,6 +824,7 @@
system_state = SYSTEM_RUNNING;
numa_default_policy();
@ -794,11 +794,11 @@ Index: linux-2.6.37-ck1/init/main.c
current->signal->flags |= SIGNAL_UNKILLABLE;
Index: linux-2.6.37-ck1/kernel/delayacct.c
Index: linux-2.6.37-ck2/kernel/delayacct.c
===================================================================
--- linux-2.6.37-ck1.orig/kernel/delayacct.c 2009-12-03 21:40:09.000000000 +1100
+++ linux-2.6.37-ck1/kernel/delayacct.c 2011-01-06 14:07:00.649901545 +1100
@@ -128,7 +128,7 @@ int __delayacct_add_tsk(struct taskstats
--- linux-2.6.37-ck2.orig/kernel/delayacct.c 2009-12-03 21:40:09.000000000 +1100
+++ linux-2.6.37-ck2/kernel/delayacct.c 2011-02-14 09:47:50.989252001 +1100
@@ -128,7 +128,7 @@
*/
t1 = tsk->sched_info.pcount;
t2 = tsk->sched_info.run_delay;
@ -807,11 +807,11 @@ Index: linux-2.6.37-ck1/kernel/delayacct.c
d->cpu_count += t1;
Index: linux-2.6.37-ck1/kernel/exit.c
Index: linux-2.6.37-ck2/kernel/exit.c
===================================================================
--- linux-2.6.37-ck1.orig/kernel/exit.c 2011-01-06 14:04:10.534807992 +1100
+++ linux-2.6.37-ck1/kernel/exit.c 2011-01-06 14:07:00.649901545 +1100
@@ -132,7 +132,7 @@ static void __exit_signal(struct task_st
--- linux-2.6.37-ck2.orig/kernel/exit.c 2011-01-06 14:04:10.000000000 +1100
+++ linux-2.6.37-ck2/kernel/exit.c 2011-02-14 09:47:50.989252001 +1100
@@ -132,7 +132,7 @@
sig->inblock += task_io_get_inblock(tsk);
sig->oublock += task_io_get_oublock(tsk);
task_io_accounting_add(&sig->ioac, &tsk->ioac);
@ -820,11 +820,11 @@ Index: linux-2.6.37-ck1/kernel/exit.c
}
sig->nr_threads--;
Index: linux-2.6.37-ck1/kernel/kthread.c
Index: linux-2.6.37-ck2/kernel/kthread.c
===================================================================
--- linux-2.6.37-ck1.orig/kernel/kthread.c 2011-01-06 14:04:10.540808350 +1100
+++ linux-2.6.37-ck1/kernel/kthread.c 2011-01-06 14:07:00.649901545 +1100
@@ -184,7 +184,9 @@ void kthread_bind(struct task_struct *p,
--- linux-2.6.37-ck2.orig/kernel/kthread.c 2011-01-06 14:04:10.000000000 +1100
+++ linux-2.6.37-ck2/kernel/kthread.c 2011-02-14 09:47:50.989252001 +1100
@@ -184,7 +184,9 @@
}
p->cpus_allowed = cpumask_of_cpu(cpu);
@ -834,11 +834,11 @@ Index: linux-2.6.37-ck1/kernel/kthread.c
p->flags |= PF_THREAD_BOUND;
}
EXPORT_SYMBOL(kthread_bind);
Index: linux-2.6.37-ck1/kernel/posix-cpu-timers.c
Index: linux-2.6.37-ck2/kernel/posix-cpu-timers.c
===================================================================
--- linux-2.6.37-ck1.orig/kernel/posix-cpu-timers.c 2011-01-06 14:04:10.544808586 +1100
+++ linux-2.6.37-ck1/kernel/posix-cpu-timers.c 2011-01-06 14:07:00.650901605 +1100
@@ -248,7 +248,7 @@ void thread_group_cputime(struct task_st
--- linux-2.6.37-ck2.orig/kernel/posix-cpu-timers.c 2011-01-06 14:04:10.000000000 +1100
+++ linux-2.6.37-ck2/kernel/posix-cpu-timers.c 2011-02-14 09:47:50.990252001 +1100
@@ -248,7 +248,7 @@
do {
times->utime = cputime_add(times->utime, t->utime);
times->stime = cputime_add(times->stime, t->stime);
@ -847,7 +847,7 @@ Index: linux-2.6.37-ck1/kernel/posix-cpu-timers.c
} while_each_thread(tsk, t);
out:
rcu_read_unlock();
@@ -508,7 +508,7 @@ static void cleanup_timers(struct list_h
@@ -508,7 +508,7 @@
void posix_cpu_timers_exit(struct task_struct *tsk)
{
cleanup_timers(tsk->cpu_timers,
@ -856,7 +856,7 @@ Index: linux-2.6.37-ck1/kernel/posix-cpu-timers.c
}
void posix_cpu_timers_exit_group(struct task_struct *tsk)
@@ -518,7 +518,7 @@ void posix_cpu_timers_exit_group(struct
@@ -518,7 +518,7 @@
cleanup_timers(tsk->signal->cpu_timers,
cputime_add(tsk->utime, sig->utime),
cputime_add(tsk->stime, sig->stime),
@ -865,7 +865,7 @@ Index: linux-2.6.37-ck1/kernel/posix-cpu-timers.c
}
static void clear_dead_task(struct k_itimer *timer, union cpu_time_count now)
@@ -949,7 +949,7 @@ static void check_thread_timers(struct t
@@ -949,7 +949,7 @@
struct cpu_timer_list *t = list_first_entry(timers,
struct cpu_timer_list,
entry);
@ -874,7 +874,7 @@ Index: linux-2.6.37-ck1/kernel/posix-cpu-timers.c
tsk->cputime_expires.sched_exp = t->expires.sched;
break;
}
@@ -966,7 +966,7 @@ static void check_thread_timers(struct t
@@ -966,7 +966,7 @@
ACCESS_ONCE(sig->rlim[RLIMIT_RTTIME].rlim_max);
if (hard != RLIM_INFINITY &&
@ -883,7 +883,7 @@ Index: linux-2.6.37-ck1/kernel/posix-cpu-timers.c
/*
* At the hard limit, we just die.
* No need to calculate anything else now.
@@ -974,7 +974,7 @@ static void check_thread_timers(struct t
@@ -974,7 +974,7 @@
__group_send_sig_info(SIGKILL, SEND_SIG_PRIV, tsk);
return;
}
@ -892,7 +892,7 @@ Index: linux-2.6.37-ck1/kernel/posix-cpu-timers.c
/*
* At the soft limit, send a SIGXCPU every second.
*/
@@ -1276,7 +1276,7 @@ static inline int fastpath_timer_check(s
@@ -1276,7 +1276,7 @@
struct task_cputime task_sample = {
.utime = tsk->utime,
.stime = tsk->stime,
@ -901,10 +901,10 @@ Index: linux-2.6.37-ck1/kernel/posix-cpu-timers.c
};
if (task_cputime_expired(&task_sample, &tsk->cputime_expires))
Index: linux-2.6.37-ck1/kernel/sched_bfs.c
Index: linux-2.6.37-ck2/kernel/sched_bfs.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.37-ck1/kernel/sched_bfs.c 2011-01-06 14:07:00.653901784 +1100
+++ linux-2.6.37-ck2/kernel/sched_bfs.c 2011-02-14 09:47:50.993252001 +1100
@@ -0,0 +1,7223 @@
+/*
+ * kernel/sched_bfs.c, was sched.c
@ -8129,10 +8129,10 @@ Index: linux-2.6.37-ck1/kernel/sched_bfs.c
+ return smt_gain;
+}
+#endif
Index: linux-2.6.37-ck1/kernel/sched.c
Index: linux-2.6.37-ck2/kernel/sched.c
===================================================================
--- linux-2.6.37-ck1.orig/kernel/sched.c 2011-01-06 14:04:10.552809062 +1100
+++ linux-2.6.37-ck1/kernel/sched.c 2011-01-06 14:07:00.654901843 +1100
--- linux-2.6.37-ck2.orig/kernel/sched.c 2011-01-06 14:04:10.000000000 +1100
+++ linux-2.6.37-ck2/kernel/sched.c 2011-02-14 09:47:50.994252001 +1100
@@ -1,3 +1,6 @@
+#ifdef CONFIG_SCHED_BFS
+#include "sched_bfs.c"
@ -8140,16 +8140,16 @@ Index: linux-2.6.37-ck1/kernel/sched.c
/*
* kernel/sched.c
*
@@ -9603,3 +9606,4 @@ void synchronize_sched_expedited(void)
@@ -9603,3 +9606,4 @@
EXPORT_SYMBOL_GPL(synchronize_sched_expedited);
#endif /* #else #ifndef CONFIG_SMP */
+#endif /* CONFIG_SCHED_BFS */
Index: linux-2.6.37-ck1/kernel/sysctl.c
Index: linux-2.6.37-ck2/kernel/sysctl.c
===================================================================
--- linux-2.6.37-ck1.orig/kernel/sysctl.c 2011-01-06 14:04:10.555809239 +1100
+++ linux-2.6.37-ck1/kernel/sysctl.c 2011-01-06 14:07:00.654901843 +1100
@@ -117,7 +117,12 @@ static int zero;
--- linux-2.6.37-ck2.orig/kernel/sysctl.c 2011-01-06 14:04:10.000000000 +1100
+++ linux-2.6.37-ck2/kernel/sysctl.c 2011-02-14 09:47:50.995252001 +1100
@@ -117,7 +117,12 @@
static int __maybe_unused one = 1;
static int __maybe_unused two = 2;
static unsigned long one_ul = 1;
@ -8163,7 +8163,7 @@ Index: linux-2.6.37-ck1/kernel/sysctl.c
#ifdef CONFIG_PRINTK
static int ten_thousand = 10000;
#endif
@@ -252,7 +257,7 @@ static struct ctl_table root_table[] = {
@@ -252,7 +257,7 @@
{ }
};
@ -8172,7 +8172,7 @@ Index: linux-2.6.37-ck1/kernel/sysctl.c
static int min_sched_granularity_ns = 100000; /* 100 usecs */
static int max_sched_granularity_ns = NSEC_PER_SEC; /* 1 second */
static int min_wakeup_granularity_ns; /* 0 usecs */
@@ -269,6 +274,7 @@ static int max_extfrag_threshold = 1000;
@@ -269,6 +274,7 @@
#endif
static struct ctl_table kern_table[] = {
@ -8180,7 +8180,7 @@ Index: linux-2.6.37-ck1/kernel/sysctl.c
{
.procname = "sched_child_runs_first",
.data = &sysctl_sched_child_runs_first,
@@ -382,6 +388,7 @@ static struct ctl_table kern_table[] = {
@@ -382,6 +388,7 @@
.mode = 0644,
.proc_handler = proc_dointvec,
},
@ -8188,7 +8188,7 @@ Index: linux-2.6.37-ck1/kernel/sysctl.c
#ifdef CONFIG_PROVE_LOCKING
{
.procname = "prove_locking",
@@ -815,6 +822,26 @@ static struct ctl_table kern_table[] = {
@@ -815,6 +822,26 @@
.proc_handler = proc_dointvec,
},
#endif
@ -8215,11 +8215,11 @@ Index: linux-2.6.37-ck1/kernel/sysctl.c
#if defined(CONFIG_S390) && defined(CONFIG_SMP)
{
.procname = "spin_retry",
Index: linux-2.6.37-ck1/lib/Kconfig.debug
Index: linux-2.6.37-ck2/lib/Kconfig.debug
===================================================================
--- linux-2.6.37-ck1.orig/lib/Kconfig.debug 2011-01-06 14:04:10.564809772 +1100
+++ linux-2.6.37-ck1/lib/Kconfig.debug 2011-01-06 14:07:00.655901902 +1100
@@ -833,7 +833,7 @@ config BOOT_PRINTK_DELAY
--- linux-2.6.37-ck2.orig/lib/Kconfig.debug 2011-01-06 14:04:10.000000000 +1100
+++ linux-2.6.37-ck2/lib/Kconfig.debug 2011-02-14 09:47:50.995252001 +1100
@@ -833,7 +833,7 @@
config RCU_TORTURE_TEST
tristate "torture tests for RCU"
@ -8228,11 +8228,11 @@ Index: linux-2.6.37-ck1/lib/Kconfig.debug
default n
help
This option provides a kernel module that runs torture tests
Index: linux-2.6.37-ck1/include/linux/jiffies.h
Index: linux-2.6.37-ck2/include/linux/jiffies.h
===================================================================
--- linux-2.6.37-ck1.orig/include/linux/jiffies.h 2010-02-25 21:51:52.000000000 +1100
+++ linux-2.6.37-ck1/include/linux/jiffies.h 2011-01-06 14:07:00.655901902 +1100
@@ -164,7 +164,7 @@ static inline u64 get_jiffies_64(void)
--- linux-2.6.37-ck2.orig/include/linux/jiffies.h 2010-02-25 21:51:52.000000000 +1100
+++ linux-2.6.37-ck2/include/linux/jiffies.h 2011-02-14 09:47:50.995252001 +1100
@@ -164,7 +164,7 @@
* Have the 32 bit jiffies value wrap 5 minutes after boot
* so jiffies wrap bugs show up earlier.
*/

View File

@ -0,0 +1,60 @@
Fix a failure to build if CPU hotplug is disabled with BFS.
-ck
---
kernel/sched_bfs.c | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
Index: linux-2.6.37-ck2/kernel/sched_bfs.c
===================================================================
--- linux-2.6.37-ck2.orig/kernel/sched_bfs.c 2011-02-14 09:50:24.351252002 +1100
+++ linux-2.6.37-ck2/kernel/sched_bfs.c 2011-02-14 09:53:53.820252000 +1100
@@ -4812,6 +4812,23 @@
grq_unlock_irqrestore(&flags);
}
+/*
+ * Ensures that the idle task is using init_mm right before its cpu goes
+ * offline.
+ */
+void idle_task_exit(void)
+{
+ struct mm_struct *mm = current->active_mm;
+
+ BUG_ON(cpu_online(smp_processor_id()));
+
+ if (mm != &init_mm)
+ switch_mm(mm, &init_mm, current);
+ mmdrop(mm);
+}
+
+#endif /* CONFIG_HOTPLUG_CPU */
+
void sched_set_stop_task(int cpu, struct task_struct *stop)
{
struct sched_param stop_param = { .sched_priority = STOP_PRIO };
@@ -4841,23 +4858,6 @@
}
}
-/*
- * Ensures that the idle task is using init_mm right before its cpu goes
- * offline.
- */
-void idle_task_exit(void)
-{
- struct mm_struct *mm = current->active_mm;
-
- BUG_ON(cpu_online(smp_processor_id()));
-
- if (mm != &init_mm)
- switch_mm(mm, &init_mm, current);
- mmdrop(mm);
-}
-
-#endif /* CONFIG_HOTPLUG_CPU */
-
#if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
static struct ctl_table sd_ctl_dir[] = {

View File

@ -2,15 +2,15 @@
Makefile | 4 ++++
1 file changed, 4 insertions(+)
Index: linux-2.6.37-ck1/Makefile
Index: linux-2.6.37-ck2/Makefile
===================================================================
--- linux-2.6.37-ck1.orig/Makefile 2011-01-06 14:04:07.612634764 +1100
+++ linux-2.6.37-ck1/Makefile 2011-01-06 14:09:14.006825250 +1100
@@ -10,6 +10,10 @@ NAME = Flesh-Eating Bats with Fangs
--- linux-2.6.37-ck2.orig/Makefile 2011-01-06 14:04:07.000000000 +1100
+++ linux-2.6.37-ck2/Makefile 2011-02-14 10:11:20.469252000 +1100
@@ -10,6 +10,10 @@
# Comments in this file are targeted only to the developer, do not
# expect to learn how to build the kernel reading this file.
+CKVERSION = -ck1
+CKVERSION = -ck2
+CKNAME = BFS Powered
+EXTRAVERSION := $(EXTRAVERSION)$(CKVERSION)
+

View File

@ -2,10 +2,10 @@
drivers/cpufreq/cpufreq_ondemand.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
Index: linux-2.6.37-ck1/drivers/cpufreq/cpufreq_ondemand.c
Index: linux-2.6.37-ck2/drivers/cpufreq/cpufreq_ondemand.c
===================================================================
--- linux-2.6.37-ck1.orig/drivers/cpufreq/cpufreq_ondemand.c 2011-01-06 14:04:08.000000000 +1100
+++ linux-2.6.37-ck1/drivers/cpufreq/cpufreq_ondemand.c 2011-01-06 14:08:56.522785888 +1100
--- linux-2.6.37-ck2.orig/drivers/cpufreq/cpufreq_ondemand.c 2011-01-06 14:04:08.000000000 +1100
+++ linux-2.6.37-ck2/drivers/cpufreq/cpufreq_ondemand.c 2011-02-14 10:11:11.438252001 +1100
@@ -28,12 +28,12 @@
* It helps to keep variable names smaller, simpler
*/
@ -22,7 +22,7 @@ Index: linux-2.6.37-ck1/drivers/cpufreq/cpufreq_ondemand.c
#define MICRO_FREQUENCY_MIN_SAMPLE_RATE (10000)
#define MIN_FREQUENCY_UP_THRESHOLD (11)
#define MAX_FREQUENCY_UP_THRESHOLD (100)
@@ -513,10 +513,10 @@ static void dbs_check_cpu(struct cpu_dbs
@@ -513,10 +513,10 @@
/*
* Every sampling_rate, we check, if current idle time is less

View File

@ -2,10 +2,10 @@
kernel/Kconfig.hz | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-2.6.37-ck1/kernel/Kconfig.hz
Index: linux-2.6.37-ck2/kernel/Kconfig.hz
===================================================================
--- linux-2.6.37-ck1.orig/kernel/Kconfig.hz 2009-06-10 13:05:27.000000000 +1000
+++ linux-2.6.37-ck1/kernel/Kconfig.hz 2011-01-06 14:07:58.988366741 +1100
--- linux-2.6.37-ck2.orig/kernel/Kconfig.hz 2009-06-10 13:05:27.000000000 +1000
+++ linux-2.6.37-ck2/kernel/Kconfig.hz 2011-02-14 10:11:10.474252000 +1100
@@ -4,7 +4,7 @@
choice

View File

@ -2,11 +2,11 @@
kernel/Kconfig.hz | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
Index: linux-2.6.37-ck1/kernel/Kconfig.hz
Index: linux-2.6.37-ck2/kernel/Kconfig.hz
===================================================================
--- linux-2.6.37-ck1.orig/kernel/Kconfig.hz 2011-01-06 14:07:58.988366741 +1100
+++ linux-2.6.37-ck1/kernel/Kconfig.hz 2011-01-06 14:07:59.115374288 +1100
@@ -23,13 +23,14 @@ choice
--- linux-2.6.37-ck2.orig/kernel/Kconfig.hz 2011-02-14 10:11:10.474252000 +1100
+++ linux-2.6.37-ck2/kernel/Kconfig.hz 2011-02-14 10:11:10.702252000 +1100
@@ -23,13 +23,14 @@
with lots of processors that may show reduced performance if
too many timer interrupts are occurring.
@ -26,7 +26,7 @@ Index: linux-2.6.37-ck1/kernel/Kconfig.hz
config HZ_300
bool "300 HZ"
@@ -43,14 +44,16 @@ choice
@@ -43,14 +44,16 @@
bool "1000 HZ"
help
1000 Hz is the preferred choice for desktop systems and other

View File

@ -7,11 +7,11 @@
kernel/Kconfig.hz | 64 +++++++++++++++++++++++++++++++++++++++
6 files changed, 76 insertions(+), 8 deletions(-)
Index: linux-2.6.37-ck1/arch/x86/kernel/cpu/proc.c
Index: linux-2.6.37-ck2/arch/x86/kernel/cpu/proc.c
===================================================================
--- linux-2.6.37-ck1.orig/arch/x86/kernel/cpu/proc.c 2009-12-03 21:39:58.000000000 +1100
+++ linux-2.6.37-ck1/arch/x86/kernel/cpu/proc.c 2011-01-06 14:07:59.250382309 +1100
@@ -109,7 +109,7 @@ static int show_cpuinfo(struct seq_file
--- linux-2.6.37-ck2.orig/arch/x86/kernel/cpu/proc.c 2009-12-03 21:39:58.000000000 +1100
+++ linux-2.6.37-ck2/arch/x86/kernel/cpu/proc.c 2011-02-14 10:11:10.919252001 +1100
@@ -109,7 +109,7 @@
seq_printf(m, "\nbogomips\t: %lu.%02lu\n",
c->loops_per_jiffy/(500000/HZ),
@ -20,11 +20,11 @@ Index: linux-2.6.37-ck1/arch/x86/kernel/cpu/proc.c
#ifdef CONFIG_X86_64
if (c->x86_tlbsize > 0)
Index: linux-2.6.37-ck1/arch/x86/kernel/smpboot.c
Index: linux-2.6.37-ck2/arch/x86/kernel/smpboot.c
===================================================================
--- linux-2.6.37-ck1.orig/arch/x86/kernel/smpboot.c 2011-01-06 14:04:08.473685806 +1100
+++ linux-2.6.37-ck1/arch/x86/kernel/smpboot.c 2011-01-06 14:07:59.251382368 +1100
@@ -497,7 +497,7 @@ static void impress_friends(void)
--- linux-2.6.37-ck2.orig/arch/x86/kernel/smpboot.c 2011-01-06 14:04:08.000000000 +1100
+++ linux-2.6.37-ck2/arch/x86/kernel/smpboot.c 2011-02-14 10:11:10.920252001 +1100
@@ -497,7 +497,7 @@
"Total of %d processors activated (%lu.%02lu BogoMIPS).\n",
num_online_cpus(),
bogosum/(500000/HZ),
@ -33,10 +33,10 @@ Index: linux-2.6.37-ck1/arch/x86/kernel/smpboot.c
pr_debug("Before bogocount - setting activated=1.\n");
}
Index: linux-2.6.37-ck1/include/linux/nfsd/stats.h
Index: linux-2.6.37-ck2/include/linux/nfsd/stats.h
===================================================================
--- linux-2.6.37-ck1.orig/include/linux/nfsd/stats.h 2009-06-10 13:05:27.000000000 +1000
+++ linux-2.6.37-ck1/include/linux/nfsd/stats.h 2011-01-06 14:07:59.251382368 +1100
--- linux-2.6.37-ck2.orig/include/linux/nfsd/stats.h 2009-06-10 13:05:27.000000000 +1000
+++ linux-2.6.37-ck2/include/linux/nfsd/stats.h 2011-02-14 10:11:10.920252001 +1100
@@ -11,8 +11,8 @@
#include <linux/nfs4.h>
@ -48,11 +48,11 @@ Index: linux-2.6.37-ck1/include/linux/nfsd/stats.h
#ifdef __KERNEL__
Index: linux-2.6.37-ck1/include/net/inet_timewait_sock.h
Index: linux-2.6.37-ck2/include/net/inet_timewait_sock.h
===================================================================
--- linux-2.6.37-ck1.orig/include/net/inet_timewait_sock.h 2010-08-02 11:12:25.000000000 +1000
+++ linux-2.6.37-ck1/include/net/inet_timewait_sock.h 2011-01-06 14:07:59.251382368 +1100
@@ -39,8 +39,8 @@ struct inet_hashinfo;
--- linux-2.6.37-ck2.orig/include/net/inet_timewait_sock.h 2010-08-02 11:12:25.000000000 +1000
+++ linux-2.6.37-ck2/include/net/inet_timewait_sock.h 2011-02-14 10:11:10.920252001 +1100
@@ -39,8 +39,8 @@
* If time > 4sec, it is "slow" path, no recycling is required,
* so that we select tick to get range about 4 seconds.
*/
@ -63,7 +63,7 @@ Index: linux-2.6.37-ck1/include/net/inet_timewait_sock.h
#elif HZ <= 32
# define INET_TWDR_RECYCLE_TICK (5 + 2 - INET_TWDR_RECYCLE_SLOTS_LOG)
#elif HZ <= 64
@@ -55,8 +55,12 @@ struct inet_hashinfo;
@@ -55,8 +55,12 @@
# define INET_TWDR_RECYCLE_TICK (10 + 2 - INET_TWDR_RECYCLE_SLOTS_LOG)
#elif HZ <= 2048
# define INET_TWDR_RECYCLE_TICK (11 + 2 - INET_TWDR_RECYCLE_SLOTS_LOG)
@ -77,11 +77,11 @@ Index: linux-2.6.37-ck1/include/net/inet_timewait_sock.h
#endif
/* TIME_WAIT reaping mechanism. */
Index: linux-2.6.37-ck1/init/calibrate.c
Index: linux-2.6.37-ck2/init/calibrate.c
===================================================================
--- linux-2.6.37-ck1.orig/init/calibrate.c 2010-02-25 21:51:52.000000000 +1100
+++ linux-2.6.37-ck1/init/calibrate.c 2011-01-06 14:07:59.251382368 +1100
@@ -176,7 +176,7 @@ void __cpuinit calibrate_delay(void)
--- linux-2.6.37-ck2.orig/init/calibrate.c 2010-02-25 21:51:52.000000000 +1100
+++ linux-2.6.37-ck2/init/calibrate.c 2011-02-14 10:11:10.921252001 +1100
@@ -176,7 +176,7 @@
if (!printed)
pr_cont("%lu.%02lu BogoMIPS (lpj=%lu)\n",
loops_per_jiffy/(500000/HZ),
@ -90,11 +90,11 @@ Index: linux-2.6.37-ck1/init/calibrate.c
printed = true;
}
Index: linux-2.6.37-ck1/kernel/Kconfig.hz
Index: linux-2.6.37-ck2/kernel/Kconfig.hz
===================================================================
--- linux-2.6.37-ck1.orig/kernel/Kconfig.hz 2011-01-06 14:07:59.115374288 +1100
+++ linux-2.6.37-ck1/kernel/Kconfig.hz 2011-01-06 14:07:59.251382368 +1100
@@ -48,6 +48,63 @@ choice
--- linux-2.6.37-ck2.orig/kernel/Kconfig.hz 2011-02-14 10:11:10.702252000 +1100
+++ linux-2.6.37-ck2/kernel/Kconfig.hz 2011-02-14 10:11:10.921252001 +1100
@@ -48,6 +48,63 @@
can also benefit from this choice without sacrificing battery life
if dynticks is also enabled.
@ -158,7 +158,7 @@ Index: linux-2.6.37-ck1/kernel/Kconfig.hz
endchoice
config HZ
@@ -56,6 +113,13 @@ config HZ
@@ -56,6 +113,13 @@
default 250 if HZ_250_NODEFAULT
default 300 if HZ_300
default 1000 if HZ_1000

View File

@ -2,11 +2,11 @@
arch/x86/Kconfig | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
Index: linux-2.6.37-ck1/arch/x86/Kconfig
Index: linux-2.6.37-ck2/arch/x86/Kconfig
===================================================================
--- linux-2.6.37-ck1.orig/arch/x86/Kconfig 2011-01-06 14:04:08.122664999 +1100
+++ linux-2.6.37-ck1/arch/x86/Kconfig 2011-01-06 14:07:58.859359075 +1100
@@ -1046,7 +1046,7 @@ endchoice
--- linux-2.6.37-ck2.orig/arch/x86/Kconfig 2011-01-06 14:04:08.000000000 +1100
+++ linux-2.6.37-ck2/arch/x86/Kconfig 2011-02-14 10:11:10.260252001 +1100
@@ -1046,7 +1046,7 @@
choice
depends on EXPERIMENTAL
@ -15,7 +15,7 @@ Index: linux-2.6.37-ck1/arch/x86/Kconfig
default VMSPLIT_3G
depends on X86_32
---help---
@@ -1066,17 +1066,17 @@ choice
@@ -1066,17 +1066,17 @@
option alone!
config VMSPLIT_3G

View File

@ -2,11 +2,11 @@
mm/vmscan.c | 33 ++++++++++++++++++++++++++++++++-
1 file changed, 32 insertions(+), 1 deletion(-)
Index: linux-2.6.37-ck1/mm/vmscan.c
Index: linux-2.6.37-ck2/mm/vmscan.c
===================================================================
--- linux-2.6.37-ck1.orig/mm/vmscan.c 2011-01-06 14:07:58.020309225 +1100
+++ linux-2.6.37-ck1/mm/vmscan.c 2011-01-06 14:07:58.175318434 +1100
@@ -1860,6 +1860,33 @@ static void shrink_zone(int priority, st
--- linux-2.6.37-ck2.orig/mm/vmscan.c 2011-02-14 10:11:00.986252001 +1100
+++ linux-2.6.37-ck2/mm/vmscan.c 2011-02-14 10:11:01.254252001 +1100
@@ -1855,6 +1855,33 @@
}
/*
@ -40,7 +40,7 @@ Index: linux-2.6.37-ck1/mm/vmscan.c
* This is the direct reclaim path, for page-allocating processes. We only
* try to reclaim pages from zones which will satisfy the caller's allocation
* request.
@@ -2462,6 +2489,7 @@ static int kswapd(void *p)
@@ -2457,6 +2484,7 @@
}
}
@ -48,7 +48,7 @@ Index: linux-2.6.37-ck1/mm/vmscan.c
order = pgdat->kswapd_max_order;
}
finish_wait(&pgdat->kswapd_wait, &wait);
@@ -2488,6 +2516,7 @@ static int kswapd(void *p)
@@ -2483,6 +2511,7 @@
void wakeup_kswapd(struct zone *zone, int order)
{
pg_data_t *pgdat;
@ -56,7 +56,7 @@ Index: linux-2.6.37-ck1/mm/vmscan.c
if (!populated_zone(zone))
return;
@@ -2500,7 +2529,9 @@ void wakeup_kswapd(struct zone *zone, in
@@ -2495,7 +2524,9 @@
trace_mm_vmscan_wakeup_kswapd(pgdat->node_id, zone_idx(zone), order);
if (!cpuset_zone_allowed_hardwall(zone, GFP_KERNEL))
return;

View File

@ -19,11 +19,11 @@ the latency of the system as a whole.
mm/page-writeback.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-2.6.37-ck1/mm/page-writeback.c
Index: linux-2.6.37-ck2/mm/page-writeback.c
===================================================================
--- linux-2.6.37-ck1.orig/mm/page-writeback.c 2011-01-06 14:04:10.576810484 +1100
+++ linux-2.6.37-ck1/mm/page-writeback.c 2011-01-06 14:07:58.729351350 +1100
@@ -78,7 +78,7 @@ int vm_highmem_is_dirtyable;
--- linux-2.6.37-ck2.orig/mm/page-writeback.c 2011-01-06 14:04:10.000000000 +1100
+++ linux-2.6.37-ck2/mm/page-writeback.c 2011-02-14 10:11:10.037252000 +1100
@@ -78,7 +78,7 @@
/*
* The generator of dirty data starts writeback at this percentage
*/

View File

@ -5,11 +5,11 @@
mm/vmscan.c | 2 +-
4 files changed, 7 insertions(+), 8 deletions(-)
Index: linux-2.6.37-ck1/include/linux/swap.h
Index: linux-2.6.37-ck2/include/linux/swap.h
===================================================================
--- linux-2.6.37-ck1.orig/include/linux/swap.h 2011-01-06 14:07:57.889301442 +1100
+++ linux-2.6.37-ck1/include/linux/swap.h 2011-01-06 14:07:58.019309165 +1100
@@ -192,7 +192,7 @@ struct swap_list_t {
--- linux-2.6.37-ck2.orig/include/linux/swap.h 2011-02-14 10:11:00.763252001 +1100
+++ linux-2.6.37-ck2/include/linux/swap.h 2011-02-14 10:11:00.982252001 +1100
@@ -192,7 +192,7 @@
int next; /* swapfile to be used next */
};
@ -18,11 +18,11 @@ Index: linux-2.6.37-ck1/include/linux/swap.h
#define vm_swap_full() (nr_swap_pages*2 < total_swap_pages)
/* linux/mm/page_alloc.c */
Index: linux-2.6.37-ck1/mm/memory.c
Index: linux-2.6.37-ck2/mm/memory.c
===================================================================
--- linux-2.6.37-ck1.orig/mm/memory.c 2011-01-06 14:04:10.573810305 +1100
+++ linux-2.6.37-ck1/mm/memory.c 2011-01-06 14:07:58.019309165 +1100
@@ -2754,7 +2754,7 @@ static int do_swap_page(struct mm_struct
--- linux-2.6.37-ck2.orig/mm/memory.c 2011-01-06 14:04:10.000000000 +1100
+++ linux-2.6.37-ck2/mm/memory.c 2011-02-14 10:11:00.984252001 +1100
@@ -2754,7 +2754,7 @@
mem_cgroup_commit_charge_swapin(page, ptr);
swap_free(entry);
@ -31,11 +31,11 @@ Index: linux-2.6.37-ck1/mm/memory.c
try_to_free_swap(page);
unlock_page(page);
if (swapcache) {
Index: linux-2.6.37-ck1/mm/swapfile.c
Index: linux-2.6.37-ck2/mm/swapfile.c
===================================================================
--- linux-2.6.37-ck1.orig/mm/swapfile.c 2011-01-06 14:04:10.582810838 +1100
+++ linux-2.6.37-ck1/mm/swapfile.c 2011-01-06 14:07:58.020309225 +1100
@@ -321,7 +321,7 @@ checks:
--- linux-2.6.37-ck2.orig/mm/swapfile.c 2011-01-06 14:04:10.000000000 +1100
+++ linux-2.6.37-ck2/mm/swapfile.c 2011-02-14 10:11:00.985252001 +1100
@@ -321,7 +321,7 @@
scan_base = offset = si->lowest_bit;
/* reuse swap entry of cache-only swap if not busy. */
@ -44,7 +44,7 @@ Index: linux-2.6.37-ck1/mm/swapfile.c
int swap_was_freed;
spin_unlock(&swap_lock);
swap_was_freed = __try_to_reclaim_swap(si, offset);
@@ -410,7 +410,7 @@ scan:
@@ -410,7 +410,7 @@
spin_lock(&swap_lock);
goto checks;
}
@ -53,7 +53,7 @@ Index: linux-2.6.37-ck1/mm/swapfile.c
spin_lock(&swap_lock);
goto checks;
}
@@ -425,7 +425,7 @@ scan:
@@ -425,7 +425,7 @@
spin_lock(&swap_lock);
goto checks;
}
@ -62,7 +62,7 @@ Index: linux-2.6.37-ck1/mm/swapfile.c
spin_lock(&swap_lock);
goto checks;
}
@@ -739,8 +739,7 @@ int free_swap_and_cache(swp_entry_t entr
@@ -739,8 +739,7 @@
* Not mapped elsewhere, or swap space full? Free it!
* Also recheck PageSwapCache now page is locked (above).
*/
@ -72,11 +72,11 @@ Index: linux-2.6.37-ck1/mm/swapfile.c
delete_from_swap_cache(page);
SetPageDirty(page);
}
Index: linux-2.6.37-ck1/mm/vmscan.c
Index: linux-2.6.37-ck2/mm/vmscan.c
===================================================================
--- linux-2.6.37-ck1.orig/mm/vmscan.c 2011-01-06 14:07:57.758293657 +1100
+++ linux-2.6.37-ck1/mm/vmscan.c 2011-01-06 14:07:58.020309225 +1100
@@ -900,7 +900,7 @@ cull_mlocked:
--- linux-2.6.37-ck2.orig/mm/vmscan.c 2011-02-14 10:11:00.536252000 +1100
+++ linux-2.6.37-ck2/mm/vmscan.c 2011-02-14 10:11:00.986252001 +1100
@@ -900,7 +900,7 @@
activate_locked:
/* Not a candidate for swapping, so reclaim swap space. */

View File

@ -2,11 +2,11 @@
include/linux/swap.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Index: linux-2.6.37-ck1/include/linux/swap.h
Index: linux-2.6.37-ck2/include/linux/swap.h
===================================================================
--- linux-2.6.37-ck1.orig/include/linux/swap.h 2011-01-06 14:04:10.493805562 +1100
+++ linux-2.6.37-ck1/include/linux/swap.h 2011-01-06 14:07:57.889301442 +1100
@@ -348,9 +348,10 @@ extern struct mm_struct *swap_token_mm;
--- linux-2.6.37-ck2.orig/include/linux/swap.h 2011-01-06 14:04:10.000000000 +1100
+++ linux-2.6.37-ck2/include/linux/swap.h 2011-02-14 10:11:00.763252001 +1100
@@ -348,9 +348,10 @@
extern void grab_swap_token(struct mm_struct *);
extern void __put_swap_token(struct mm_struct *);

View File

@ -3,10 +3,10 @@
mm/vmscan.c | 42 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 47 insertions(+), 1 deletion(-)
Index: linux-2.6.37-ck1/include/linux/mmzone.h
Index: linux-2.6.37-ck2/include/linux/mmzone.h
===================================================================
--- linux-2.6.37-ck1.orig/include/linux/mmzone.h 2011-01-06 14:04:10.468804082 +1100
+++ linux-2.6.37-ck1/include/linux/mmzone.h 2011-01-06 14:07:58.304326100 +1100
--- linux-2.6.37-ck2.orig/include/linux/mmzone.h 2011-01-06 14:04:10.000000000 +1100
+++ linux-2.6.37-ck2/include/linux/mmzone.h 2011-02-14 10:11:01.470252001 +1100
@@ -15,6 +15,7 @@
#include <linux/seqlock.h>
#include <linux/nodemask.h>
@ -15,7 +15,7 @@ Index: linux-2.6.37-ck1/include/linux/mmzone.h
#include <generated/bounds.h>
#include <asm/atomic.h>
#include <asm/page.h>
@@ -161,12 +162,14 @@ enum zone_watermarks {
@@ -161,12 +162,14 @@
WMARK_MIN,
WMARK_LOW,
WMARK_HIGH,
@ -30,7 +30,7 @@ Index: linux-2.6.37-ck1/include/linux/mmzone.h
struct per_cpu_pages {
int count; /* number of pages in the list */
@@ -343,7 +346,7 @@ struct zone {
@@ -343,7 +346,7 @@
ZONE_PADDING(_pad1_)
/* Fields commonly accessed by the page reclaim scanner */
@ -39,7 +39,7 @@ Index: linux-2.6.37-ck1/include/linux/mmzone.h
struct zone_lru {
struct list_head list;
} lru[NR_LRU_LISTS];
@@ -645,6 +648,7 @@ typedef struct pglist_data {
@@ -645,6 +648,7 @@
wait_queue_head_t kswapd_wait;
struct task_struct *kswapd;
int kswapd_max_order;
@ -47,10 +47,10 @@ Index: linux-2.6.37-ck1/include/linux/mmzone.h
} pg_data_t;
#define node_present_pages(nid) (NODE_DATA(nid)->node_present_pages)
Index: linux-2.6.37-ck1/mm/vmscan.c
Index: linux-2.6.37-ck2/mm/vmscan.c
===================================================================
--- linux-2.6.37-ck1.orig/mm/vmscan.c 2011-01-06 14:07:58.175318434 +1100
+++ linux-2.6.37-ck1/mm/vmscan.c 2011-01-06 14:07:58.305326159 +1100
--- linux-2.6.37-ck2.orig/mm/vmscan.c 2011-02-14 10:11:01.254252001 +1100
+++ linux-2.6.37-ck2/mm/vmscan.c 2011-02-14 10:11:01.471252001 +1100
@@ -36,6 +36,7 @@
#include <linux/rwsem.h>
#include <linux/delay.h>
@ -59,7 +59,7 @@ Index: linux-2.6.37-ck1/mm/vmscan.c
#include <linux/freezer.h>
#include <linux/memcontrol.h>
#include <linux/delayacct.h>
@@ -2403,6 +2404,8 @@ out:
@@ -2398,6 +2399,8 @@
return sc.nr_reclaimed;
}
@ -68,7 +68,7 @@ Index: linux-2.6.37-ck1/mm/vmscan.c
/*
* The background pageout daemon, started as a kernel thread
* from the init process.
@@ -2453,6 +2456,8 @@ static int kswapd(void *p)
@@ -2448,6 +2451,8 @@
unsigned long new_order;
int ret;
@ -77,7 +77,7 @@ Index: linux-2.6.37-ck1/mm/vmscan.c
prepare_to_wait(&pgdat->kswapd_wait, &wait, TASK_INTERRUPTIBLE);
new_order = pgdat->kswapd_max_order;
pgdat->kswapd_max_order = 0;
@@ -2637,20 +2642,57 @@ static int __devinit cpu_callback(struct
@@ -2632,20 +2637,57 @@
}
/*

View File

@ -5,11 +5,11 @@
mm/swap.c | 30 ++++++++++++++++++++++-----
4 files changed, 86 insertions(+), 16 deletions(-)
Index: linux-2.6.37-ck1/include/linux/mm_inline.h
Index: linux-2.6.37-ck2/include/linux/mm_inline.h
===================================================================
--- linux-2.6.37-ck1.orig/include/linux/mm_inline.h 2009-12-03 21:40:09.000000000 +1100
+++ linux-2.6.37-ck1/include/linux/mm_inline.h 2011-01-06 14:07:58.577342321 +1100
@@ -20,14 +20,24 @@ static inline int page_is_file_cache(str
--- linux-2.6.37-ck2.orig/include/linux/mm_inline.h 2009-12-03 21:40:09.000000000 +1100
+++ linux-2.6.37-ck2/include/linux/mm_inline.h 2011-02-14 10:11:09.770252000 +1100
@@ -20,14 +20,24 @@
}
static inline void
@ -36,11 +36,11 @@ Index: linux-2.6.37-ck1/include/linux/mm_inline.h
del_page_from_lru_list(struct zone *zone, struct page *page, enum lru_list l)
{
list_del(&page->lru);
Index: linux-2.6.37-ck1/include/linux/swap.h
Index: linux-2.6.37-ck2/include/linux/swap.h
===================================================================
--- linux-2.6.37-ck1.orig/include/linux/swap.h 2011-01-06 14:07:58.019309165 +1100
+++ linux-2.6.37-ck1/include/linux/swap.h 2011-01-06 14:07:58.578342381 +1100
@@ -206,6 +206,7 @@ extern unsigned int nr_free_pagecache_pa
--- linux-2.6.37-ck2.orig/include/linux/swap.h 2011-02-14 10:11:00.982252001 +1100
+++ linux-2.6.37-ck2/include/linux/swap.h 2011-02-14 10:11:09.770252000 +1100
@@ -206,6 +206,7 @@
/* linux/mm/swap.c */
@ -48,7 +48,7 @@ Index: linux-2.6.37-ck1/include/linux/swap.h
extern void __lru_cache_add(struct page *, enum lru_list lru);
extern void lru_cache_add_lru(struct page *, enum lru_list lru);
extern void activate_page(struct page *);
@@ -226,9 +227,14 @@ static inline void lru_cache_add_anon(st
@@ -226,9 +227,14 @@
__lru_cache_add(page, LRU_INACTIVE_ANON);
}
@ -64,11 +64,11 @@ Index: linux-2.6.37-ck1/include/linux/swap.h
}
/* LRU Isolation modes. */
Index: linux-2.6.37-ck1/mm/filemap.c
Index: linux-2.6.37-ck2/mm/filemap.c
===================================================================
--- linux-2.6.37-ck1.orig/mm/filemap.c 2011-01-06 14:04:10.569810068 +1100
+++ linux-2.6.37-ck1/mm/filemap.c 2011-01-06 14:07:58.578342381 +1100
@@ -439,8 +439,8 @@ out:
--- linux-2.6.37-ck2.orig/mm/filemap.c 2011-01-06 14:04:10.000000000 +1100
+++ linux-2.6.37-ck2/mm/filemap.c 2011-02-14 10:11:09.772252000 +1100
@@ -439,8 +439,8 @@
}
EXPORT_SYMBOL(add_to_page_cache_locked);
@ -79,7 +79,7 @@ Index: linux-2.6.37-ck1/mm/filemap.c
{
int ret;
@@ -456,12 +456,18 @@ int add_to_page_cache_lru(struct page *p
@@ -456,12 +456,18 @@
ret = add_to_page_cache(page, mapping, offset, gfp_mask);
if (ret == 0) {
if (page_is_file_cache(page))
@ -99,7 +99,7 @@ Index: linux-2.6.37-ck1/mm/filemap.c
EXPORT_SYMBOL_GPL(add_to_page_cache_lru);
#ifdef CONFIG_NUMA
@@ -968,6 +974,28 @@ static void shrink_readahead_size_eio(st
@@ -968,6 +974,28 @@
ra->ra_pages /= 4;
}
@ -128,7 +128,7 @@ Index: linux-2.6.37-ck1/mm/filemap.c
/**
* do_generic_file_read - generic file read routine
* @filp: the file to read
@@ -992,7 +1020,7 @@ static void do_generic_file_read(struct
@@ -992,7 +1020,7 @@
pgoff_t prev_index;
unsigned long offset; /* offset into pagecache page */
unsigned int prev_offset;
@ -137,7 +137,7 @@ Index: linux-2.6.37-ck1/mm/filemap.c
index = *ppos >> PAGE_CACHE_SHIFT;
prev_index = ra->prev_pos >> PAGE_CACHE_SHIFT;
@@ -1003,7 +1031,7 @@ static void do_generic_file_read(struct
@@ -1003,7 +1031,7 @@
for (;;) {
struct page *page;
pgoff_t end_index;
@ -146,7 +146,7 @@ Index: linux-2.6.37-ck1/mm/filemap.c
unsigned long nr, ret;
cond_resched();
@@ -1177,8 +1205,16 @@ no_cached_page:
@@ -1177,8 +1205,16 @@
desc->error = -ENOMEM;
goto out;
}
@ -165,11 +165,11 @@ Index: linux-2.6.37-ck1/mm/filemap.c
if (error) {
page_cache_release(page);
if (error == -EEXIST)
Index: linux-2.6.37-ck1/mm/swap.c
Index: linux-2.6.37-ck2/mm/swap.c
===================================================================
--- linux-2.6.37-ck1.orig/mm/swap.c 2011-01-06 14:04:10.582810838 +1100
+++ linux-2.6.37-ck1/mm/swap.c 2011-01-06 14:07:58.578342381 +1100
@@ -215,15 +215,23 @@ void mark_page_accessed(struct page *pag
--- linux-2.6.37-ck2.orig/mm/swap.c 2011-01-06 14:04:10.000000000 +1100
+++ linux-2.6.37-ck2/mm/swap.c 2011-02-14 10:11:09.772252000 +1100
@@ -215,15 +215,23 @@
EXPORT_SYMBOL(mark_page_accessed);
@ -195,7 +195,7 @@ Index: linux-2.6.37-ck1/mm/swap.c
EXPORT_SYMBOL(__lru_cache_add);
/**
@@ -231,7 +239,7 @@ EXPORT_SYMBOL(__lru_cache_add);
@@ -231,7 +239,7 @@
* @page: the page to be added to the LRU.
* @lru: the LRU list to which the page is added.
*/
@ -204,7 +204,7 @@ Index: linux-2.6.37-ck1/mm/swap.c
{
if (PageActive(page)) {
VM_BUG_ON(PageUnevictable(page));
@@ -242,7 +250,12 @@ void lru_cache_add_lru(struct page *page
@@ -242,7 +250,12 @@
}
VM_BUG_ON(PageLRU(page) || PageActive(page) || PageUnevictable(page));
@ -218,7 +218,7 @@ Index: linux-2.6.37-ck1/mm/swap.c
}
/**
@@ -403,7 +416,7 @@ EXPORT_SYMBOL(__pagevec_release);
@@ -403,7 +416,7 @@
* Add the passed pages to the LRU, then drop the caller's refcount
* on them. Reinitialises the caller's pagevec.
*/
@ -227,7 +227,7 @@ Index: linux-2.6.37-ck1/mm/swap.c
{
int i;
struct zone *zone = NULL;
@@ -431,7 +444,7 @@ void ____pagevec_lru_add(struct pagevec
@@ -431,7 +444,7 @@
if (active)
SetPageActive(page);
update_page_reclaim_stat(zone, page, file, active);
@ -236,7 +236,7 @@ Index: linux-2.6.37-ck1/mm/swap.c
}
if (zone)
spin_unlock_irq(&zone->lru_lock);
@@ -439,6 +452,11 @@ void ____pagevec_lru_add(struct pagevec
@@ -439,6 +452,11 @@
pagevec_reinit(pvec);
}

View File

@ -2,11 +2,11 @@
mm/vmscan.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-2.6.37-ck1/mm/vmscan.c
Index: linux-2.6.37-ck2/mm/vmscan.c
===================================================================
--- linux-2.6.37-ck1.orig/mm/vmscan.c 2011-01-06 14:07:57.629285994 +1100
+++ linux-2.6.37-ck1/mm/vmscan.c 2011-01-06 14:07:57.758293657 +1100
@@ -133,7 +133,7 @@ struct scan_control {
--- linux-2.6.37-ck2.orig/mm/vmscan.c 2011-01-06 14:04:10.000000000 +1100
+++ linux-2.6.37-ck2/mm/vmscan.c 2011-02-14 10:11:00.536252000 +1100
@@ -133,7 +133,7 @@
/*
* From 0 .. 100. Higher means more swappy.
*/

View File

@ -2,10 +2,10 @@
kernel/Kconfig.preempt | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
Index: linux-2.6.37-ck1/kernel/Kconfig.preempt
Index: linux-2.6.37-ck2/kernel/Kconfig.preempt
===================================================================
--- linux-2.6.37-ck1.orig/kernel/Kconfig.preempt 2009-06-10 13:05:27.000000000 +1000
+++ linux-2.6.37-ck1/kernel/Kconfig.preempt 2011-01-06 14:07:59.416392169 +1100
--- linux-2.6.37-ck2.orig/kernel/Kconfig.preempt 2009-06-10 13:05:27.000000000 +1000
+++ linux-2.6.37-ck2/kernel/Kconfig.preempt 2011-02-14 10:11:11.217252001 +1100
@@ -1,7 +1,7 @@
choice
@ -15,7 +15,7 @@ Index: linux-2.6.37-ck1/kernel/Kconfig.preempt
config PREEMPT_NONE
bool "No Forced Preemption (Server)"
@@ -17,7 +17,7 @@ config PREEMPT_NONE
@@ -17,7 +17,7 @@
latencies.
config PREEMPT_VOLUNTARY
@ -24,7 +24,7 @@ Index: linux-2.6.37-ck1/kernel/Kconfig.preempt
help
This option reduces the latency of the kernel by adding more
"explicit preemption points" to the kernel code. These new
@@ -31,7 +31,8 @@ config PREEMPT_VOLUNTARY
@@ -31,7 +31,8 @@
applications to run more 'smoothly' even when the system is
under load.

View File

@ -3,11 +3,11 @@
kernel/sched_bfs.c | 20 ++++++++++++++++++++
2 files changed, 27 insertions(+)
Index: linux-2.6.37-ck1/include/linux/sched.h
Index: linux-2.6.37-ck2/include/linux/sched.h
===================================================================
--- linux-2.6.37-ck1.orig/include/linux/sched.h 2011-01-06 14:07:00.000000000 +1100
+++ linux-2.6.37-ck1/include/linux/sched.h 2011-01-06 14:07:19.971048973 +1100
@@ -1558,6 +1558,7 @@ static inline int iso_task(struct task_s
--- linux-2.6.37-ck2.orig/include/linux/sched.h 2011-02-14 09:47:50.988252000 +1100
+++ linux-2.6.37-ck2/include/linux/sched.h 2011-02-14 10:11:00.292251999 +1100
@@ -1558,6 +1558,7 @@
return (p->policy == SCHED_ISO);
}
extern void remove_cpu(unsigned long cpu);
@ -15,7 +15,7 @@ Index: linux-2.6.37-ck1/include/linux/sched.h
#else /* CFS */
extern int runqueue_is_locked(int cpu);
#define tsk_seruntime(t) ((t)->se.sum_exec_runtime)
@@ -1581,6 +1582,12 @@ static inline int iso_task(struct task_s
@@ -1581,6 +1582,12 @@
static inline void remove_cpu(unsigned long cpu)
{
}
@ -28,11 +28,11 @@ Index: linux-2.6.37-ck1/include/linux/sched.h
#endif /* CONFIG_SCHED_BFS */
/* Future-safe accessor for struct task_struct's cpus_allowed. */
Index: linux-2.6.37-ck1/kernel/sched_bfs.c
Index: linux-2.6.37-ck2/kernel/sched_bfs.c
===================================================================
--- linux-2.6.37-ck1.orig/kernel/sched_bfs.c 2011-01-06 14:07:00.000000000 +1100
+++ linux-2.6.37-ck1/kernel/sched_bfs.c 2011-01-06 14:07:19.972049048 +1100
@@ -559,6 +559,26 @@ static inline void __task_grq_unlock(voi
--- linux-2.6.37-ck2.orig/kernel/sched_bfs.c 2011-02-14 09:53:53.820252000 +1100
+++ linux-2.6.37-ck2/kernel/sched_bfs.c 2011-02-14 10:11:00.294252001 +1100
@@ -559,6 +559,26 @@
grq_unlock();
}