Don't like ads? PRO users don't see any ads ;-)
Guest

Untitled

By: a guest on Feb 18th, 2011  |  syntax: Diff  |  size: 1.44 KB  |  hits: 390  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. --- a/patch-2.6.37-ck2  2011-02-14 00:29:35.000000000 +0100
  2. +++ b/patch-2.6.37-ck2  2011-02-19 02:06:32.000000000 +0100
  3. @@ -4239,7 +4239,7 @@
  4.  + * This waits for either a completion of a specific task to be signaled or for a
  5.  + * specified timeout to expire. It is interruptible. The timeout is in jiffies.
  6.  + */
  7. -+unsigned long __sched
  8. ++long __sched
  9.  +wait_for_completion_interruptible_timeout(struct completion *x,
  10.  +                                        unsigned long timeout)
  11.  +{
  12. @@ -4272,7 +4272,7 @@
  13.  + * signaled or for a specified timeout to expire. It can be
  14.  + * interrupted by a kill signal. The timeout is in jiffies.
  15.  + */
  16. -+unsigned long __sched
  17. ++long __sched
  18.  +wait_for_completion_killable_timeout(struct completion *x,
  19.  +                                   unsigned long timeout)
  20.  +{
  21. @@ -8320,17 +8320,17 @@
  22.  
  23.         if (!populated_zone(zone))
  24.                 return;
  25. -@@ -2495,7 +2531,9 @@
  26. -       trace_mm_vmscan_wakeup_kswapd(pgdat->node_id, zone_idx(zone), order);
  27. -       if (!cpuset_zone_allowed_hardwall(zone, GFP_KERNEL))
  28. -               return;
  29. +@@ -2494,7 +2530,9 @@
  30. +       pgdat = zone->zone_pgdat;
  31. +       if (pgdat->kswapd_max_order < order)
  32. +               pgdat->kswapd_max_order = order;
  33.  -      if (!waitqueue_active(&pgdat->kswapd_wait))
  34.  +      active = waitqueue_active(&pgdat->kswapd_wait);
  35.  +      set_kswapd_nice(pgdat->kswapd, active);
  36.  +      if (!active)
  37.                 return;
  38. -       wake_up_interruptible(&pgdat->kswapd_wait);
  39. - }
  40. +       if (zone_watermark_ok_safe(zone, order, low_wmark_pages(zone), 0, 0))
  41. +               return;
  42.  @@ -2601,20 +2639,57 @@
  43.   }