upgrade x86 to 2.6.31.6, resync patches

[openwrt-10.03/.git] / target / linux / generic-2.6 / patches-2.6.31 / 270-sched_bfs.patch

diff --git a/target/linux/generic-2.6/patches-2.6.31/270-sched_bfs.patch b/target/linux/generic-2.6/patches-2.6.31/270-sched_bfs.patch
index c045ae3abe35c7825303e1356309e02e7b0ee459..9f30674ef79ca424327380c80434abdb769148b2 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.31/270-sched_bfs.patch
+++ b/target/linux/generic-2.6/patches-2.6.31/270-sched_bfs.patch
@@ -176,7 +176,7 @@ This patch adds support for bfs v230, modified for diff size reduction
  #define sched_exec()   {}
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -441,9 +441,22 @@ config LOG_BUF_SHIFT
+@@ -451,9 +451,22 @@ config LOG_BUF_SHIFT
  config HAVE_UNSTABLE_SCHED_CLOCK
        bool
  
@@ -199,7 +199,7 @@ This patch adds support for bfs v230, modified for diff size reduction
        default n
        help
          This feature lets CPU scheduler recognize task groups and control CPU
-@@ -494,6 +507,7 @@ endchoice
+@@ -504,6 +517,7 @@ endchoice
  
  menuconfig CGROUPS
        boolean "Control Group support"