vcs.maemo.org Git - kernel-bfs/blob - kernel-bfs-2.6.28/debian/patches/strip_cfs_nokia_pr13.diff

   1 --- kernel-2.6.28.orig/debian/patches/nokia-20103103+0m5.diff   2010-11-10 00:55:39.000000000 +0100
   2 +++ kernel-2.6.28/debian/patches/nokia-20103103+0m5.diff        2010-11-10 01:07:22.996667558 +0100
   3 @@ -1131,21 +1131,6 @@
   4         }
   5
   6         wl1251_debug(DEBUG_BOOT, "tx %s cmd channel %d",
   7 ---- kernel-power-2.6.28.orig/include/linux/sched.h
   8 -+++ kernel-power-2.6.28/include/linux/sched.h
   9 -@@ -1665,11 +1665,11 @@
  10 - static inline void wake_up_idle_cpu(int cpu) { }
  11 - #endif
  12 -
  13 -+extern unsigned int sysctl_sched_child_runs_first;
  14 - #ifdef CONFIG_SCHED_DEBUG
  15 - extern unsigned int sysctl_sched_latency;
  16 - extern unsigned int sysctl_sched_min_granularity;
  17 - extern unsigned int sysctl_sched_wakeup_granularity;
  18 --extern unsigned int sysctl_sched_child_runs_first;
  19 - extern unsigned int sysctl_sched_features;
  20 - extern unsigned int sysctl_sched_migration_cost;
  21 - extern unsigned int sysctl_sched_nr_migrate;
  22  --- kernel-power-2.6.28.orig/include/linux/swap.h
  23  +++ kernel-power-2.6.28/include/linux/swap.h
  24  @@ -130,6 +130,17 @@
  25 @@ -1189,51 +1174,7 @@
  26
  27  --- kernel-power-2.6.28.orig/kernel/sched_fair.c
  28  +++ kernel-power-2.6.28/kernel/sched_fair.c
  29 -@@ -48,10 +48,10 @@
  30 - static unsigned int sched_nr_latency = 5;
  31 -
  32 - /*
  33 -- * After fork, child runs first. (default) If set to 0 then
  34 -+ * After fork, child runs first. If set to 0 then
  35 -  * parent will (try to) run first.
  36 -  */
  37 --const_debug unsigned int sysctl_sched_child_runs_first = 1;
  38 -+unsigned int sysctl_sched_child_runs_first __read_mostly;
  39 -
  40 - /*
  41 -  * sys_sched_yield() compat mode
  42 ---- kernel-power-2.6.28.orig/kernel/sysctl.c
  43 -+++ kernel-power-2.6.28/kernel/sysctl.c
  44 -@@ -235,6 +235,14 @@
  45 - #endif
  46 -
  47 - static struct ctl_table kern_table[] = {
  48 -+      {
  49 -+              .ctl_name       = CTL_UNNUMBERED,
  50 -+              .procname       = "sched_child_runs_first",
  51 -+              .data           = &sysctl_sched_child_runs_first,
  52 -+              .maxlen         = sizeof(unsigned int),
  53 -+              .mode           = 0644,
  54 -+              .proc_handler   = &proc_dointvec,
  55 -+      },
  56 - #ifdef CONFIG_SCHED_DEBUG
  57 -       {
  58 -               .ctl_name       = CTL_UNNUMBERED,
  59 -@@ -289,14 +297,6 @@
  60 -       },
  61 -       {
  62 -               .ctl_name       = CTL_UNNUMBERED,
  63 --              .procname       = "sched_child_runs_first",
  64 --              .data           = &sysctl_sched_child_runs_first,
  65 --              .maxlen         = sizeof(unsigned int),
  66 --              .mode           = 0644,
  67 --              .proc_handler   = &proc_dointvec,
  68 --      },
  69 --      {
  70 --              .ctl_name       = CTL_UNNUMBERED,
  71 -               .procname       = "sched_features",
  72 -               .data           = &sysctl_sched_features,
  73 -               .maxlen         = sizeof(unsigned int),
  74 +
  75  --- kernel-power-2.6.28.orig/mm/swapfile.c
  76  +++ kernel-power-2.6.28/mm/swapfile.c
  77  @@ -996,11 +996,55 @@