From: Dennis Groenen <dennis_groenen@hotmail.com>
Date: Wed, 27 Apr 2011 21:10:47 +0000 (+0200)
Subject: get rid of strip_cfs_nokia_pr13.diff; should've done this a long time ago
X-Git-Url: http://vcs.maemo.org/git/?p=kernel-bfs;a=commitdiff_plain;h=b51c9c5db967526dc9f97b8acd3a086dd1fe239f

get rid of strip_cfs_nokia_pr13.diff; should've done this a long time ago
---

diff --git a/kernel-bfs-2.6.28/debian/patches/bfs.patch b/kernel-bfs-2.6.28/debian/patches/bfs.patch
index 4e2ac44..5a68de7 100644
--- a/kernel-bfs-2.6.28/debian/patches/bfs.patch
+++ b/kernel-bfs-2.6.28/debian/patches/bfs.patch
@@ -7670,9 +7670,9 @@ Index: kernel-2.6.28/kernel/sysctl.c
  
  static struct ctl_table kern_table[] = {
 +#ifndef CONFIG_SCHED_BFS
- #ifdef CONFIG_SCHED_DEBUG
  	{
  		.ctl_name	= CTL_UNNUMBERED,
+ 		.procname	= "sched_child_runs_first",
 @@ -344,6 +346,7 @@ static struct ctl_table kern_table[] = {
  		.mode		= 0644,
  		.proc_handler	= &proc_dointvec,
diff --git a/kernel-bfs-2.6.28/debian/patches/series b/kernel-bfs-2.6.28/debian/patches/series
index efe8920..69acd28 100644
--- a/kernel-bfs-2.6.28/debian/patches/series
+++ b/kernel-bfs-2.6.28/debian/patches/series
@@ -1,4 +1,3 @@
-strip_cfs_nokia_pr13.diff
 nokia-20094803.3+0m5.diff
 nokia-20100903+0m5.diff
 nokia-20101501+0m5.diff
diff --git a/kernel-bfs-2.6.28/debian/patches/strip_cfs_nokia_pr13.diff b/kernel-bfs-2.6.28/debian/patches/strip_cfs_nokia_pr13.diff
deleted file mode 100644
index 71d1d65..0000000
--- a/kernel-bfs-2.6.28/debian/patches/strip_cfs_nokia_pr13.diff
+++ /dev/null
@@ -1,77 +0,0 @@
---- kernel-2.6.28.orig/debian/patches/nokia-20103103+0m5.diff	2010-11-10 00:55:39.000000000 +0100
-+++ kernel-2.6.28/debian/patches/nokia-20103103+0m5.diff	2010-11-10 01:07:22.996667558 +0100
-@@ -1131,21 +1131,6 @@
-  	}
-  
-  	wl1251_debug(DEBUG_BOOT, "tx %s cmd channel %d",
----- kernel-power-2.6.28.orig/include/linux/sched.h
--+++ kernel-power-2.6.28/include/linux/sched.h
--@@ -1665,11 +1665,11 @@
-- static inline void wake_up_idle_cpu(int cpu) { }
-- #endif
-- 
--+extern unsigned int sysctl_sched_child_runs_first;
-- #ifdef CONFIG_SCHED_DEBUG
-- extern unsigned int sysctl_sched_latency;
-- extern unsigned int sysctl_sched_min_granularity;
-- extern unsigned int sysctl_sched_wakeup_granularity;
---extern unsigned int sysctl_sched_child_runs_first;
-- extern unsigned int sysctl_sched_features;
-- extern unsigned int sysctl_sched_migration_cost;
-- extern unsigned int sysctl_sched_nr_migrate;
- --- kernel-power-2.6.28.orig/include/linux/swap.h
- +++ kernel-power-2.6.28/include/linux/swap.h
- @@ -130,6 +130,17 @@
-@@ -1189,51 +1174,7 @@
-  
- --- kernel-power-2.6.28.orig/kernel/sched_fair.c
- +++ kernel-power-2.6.28/kernel/sched_fair.c
--@@ -48,10 +48,10 @@
-- static unsigned int sched_nr_latency = 5;
-- 
-- /*
--- * After fork, child runs first. (default) If set to 0 then
--+ * After fork, child runs first. If set to 0 then
--  * parent will (try to) run first.
--  */
---const_debug unsigned int sysctl_sched_child_runs_first = 1;
--+unsigned int sysctl_sched_child_runs_first __read_mostly;
-- 
-- /*
--  * sys_sched_yield() compat mode
----- kernel-power-2.6.28.orig/kernel/sysctl.c
--+++ kernel-power-2.6.28/kernel/sysctl.c
--@@ -235,6 +235,14 @@
-- #endif
-- 
-- static struct ctl_table kern_table[] = {
--+	{
--+		.ctl_name	= CTL_UNNUMBERED,
--+		.procname	= "sched_child_runs_first",
--+		.data		= &sysctl_sched_child_runs_first,
--+		.maxlen		= sizeof(unsigned int),
--+		.mode		= 0644,
--+		.proc_handler	= &proc_dointvec,
--+	},
-- #ifdef CONFIG_SCHED_DEBUG
-- 	{
-- 		.ctl_name	= CTL_UNNUMBERED,
--@@ -289,14 +297,6 @@
-- 	},
-- 	{
-- 		.ctl_name	= CTL_UNNUMBERED,
---		.procname	= "sched_child_runs_first",
---		.data		= &sysctl_sched_child_runs_first,
---		.maxlen		= sizeof(unsigned int),
---		.mode		= 0644,
---		.proc_handler	= &proc_dointvec,
---	},
---	{
---		.ctl_name	= CTL_UNNUMBERED,
-- 		.procname	= "sched_features",
-- 		.data		= &sysctl_sched_features,
-- 		.maxlen		= sizeof(unsigned int),
-+
- --- kernel-power-2.6.28.orig/mm/swapfile.c
- +++ kernel-power-2.6.28/mm/swapfile.c
- @@ -996,11 +996,55 @@