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-09 22:25:45.000000000 +0100
   2 +++ kernel-2.6.28/debian/patches/nokia-20103103+0m5.diff        2010-11-09 23:26:15.586667441 +0100
   3 @@ -1174,21 +1174,6 @@
   4         check_charger = 0;
   5
   6         return vdat;
   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 @@ -1230,53 +1215,6 @@
  26   #define SCO_DISCONN_TIMEOUT   (HZ * 2)
  27   #define SCO_CONN_IDLE_TIMEOUT (HZ * 60)
  28
  29 ---- kernel-power-2.6.28.orig/kernel/sched_fair.c
  30 -+++ kernel-power-2.6.28/kernel/sched_fair.c
  31 -@@ -48,10 +48,10 @@
  32 - static unsigned int sched_nr_latency = 5;
  33 -
  34 - /*
  35 -- * After fork, child runs first. (default) If set to 0 then
  36 -+ * After fork, child runs first. If set to 0 then
  37 -  * parent will (try to) run first.
  38 -  */
  39 --const_debug unsigned int sysctl_sched_child_runs_first = 1;
  40 -+unsigned int sysctl_sched_child_runs_first __read_mostly;
  41 -
  42 - /*
  43 -  * sys_sched_yield() compat mode
  44 ---- kernel-power-2.6.28.orig/kernel/sysctl.c
  45 -+++ kernel-power-2.6.28/kernel/sysctl.c
  46 -@@ -235,6 +235,14 @@
  47 - #endif
  48 -
  49 - static struct ctl_table kern_table[] = {
  50 -+      {
  51 -+              .ctl_name       = CTL_UNNUMBERED,
  52 -+              .procname       = "sched_child_runs_first",
  53 -+              .data           = &sysctl_sched_child_runs_first,
  54 -+              .maxlen         = sizeof(unsigned int),
  55 -+              .mode           = 0644,
  56 -+              .proc_handler   = &proc_dointvec,
  57 -+      },
  58 - #ifdef CONFIG_SCHED_DEBUG
  59 -       {
  60 -               .ctl_name       = CTL_UNNUMBERED,
  61 -@@ -289,14 +297,6 @@
  62 -       },
  63 -       {
  64 -               .ctl_name       = CTL_UNNUMBERED,
  65 --              .procname       = "sched_child_runs_first",
  66 --              .data           = &sysctl_sched_child_runs_first,
  67 --              .maxlen         = sizeof(unsigned int),
  68 --              .mode           = 0644,
  69 --              .proc_handler   = &proc_dointvec,
  70 --      },
  71 --      {
  72 --              .ctl_name       = CTL_UNNUMBERED,
  73 -               .procname       = "sched_features",
  74 -               .data           = &sysctl_sched_features,
  75 -               .maxlen         = sizeof(unsigned int),
  76  --- kernel-power-2.6.28.orig/mm/swapfile.c
  77  +++ kernel-power-2.6.28/mm/swapfile.c
  78  @@ -996,11 +996,55 @@