diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-20 13:10:22 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-20 13:10:22 -0700 |
| commit | 90d3ac15e5c637d45849e83c828ed78c62886737 (patch) | |
| tree | c5568365f32386559d2710e8981ed41e5fe0eb12 /init | |
| parent | 9fafbd806198eb690c9a9f9fe35a879db93a1b8d (diff) | |
| parent | 317f394160e9beb97d19a84c39b7e5eb3d7815a8 (diff) | |
| download | op-kernel-dev-90d3ac15e5c637d45849e83c828ed78c62886737.zip op-kernel-dev-90d3ac15e5c637d45849e83c828ed78c62886737.tar.gz | |
Merge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8'
Conflicts:
arch/sparc/kernel/smp_32.c
With merge conflict help from Daniel Hellstrom.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index 56240e7..32745bf 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -827,6 +827,11 @@ config SCHED_AUTOGROUP desktop applications. Task group autogeneration is currently based upon task session. +config SCHED_TTWU_QUEUE + bool + depends on !SPARC32 + default y + config MM_OWNER bool |
