From b36269b6374421a67120e0e9aa3913067f280930 Mon Sep 17 00:00:00 2001
From: Daniel Hellstrom <daniel@gaisler.com>
Date: Fri, 20 May 2011 04:01:10 +0000
Subject: [PATCH] --- yaml --- r: 247914 b: refs/heads/master c:
 17d9f311eca13a42bf950198a358be1420d19c5f h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/init/Kconfig   | 5 -----
 trunk/kernel/sched.c | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 9f9b12f01316..20f5d6d721d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90d3ac15e5c637d45849e83c828ed78c62886737
+refs/heads/master: 17d9f311eca13a42bf950198a358be1420d19c5f
diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
index 32745bfe059e..56240e724d9a 100644
--- a/trunk/init/Kconfig
+++ b/trunk/init/Kconfig
@@ -827,11 +827,6 @@ 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
 
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 8c9d804dc07d..c4b3410d68d3 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -2568,7 +2568,7 @@ static void ttwu_queue(struct task_struct *p, int cpu)
 {
 	struct rq *rq = cpu_rq(cpu);
 
-#if defined(CONFIG_SMP) && defined(CONFIG_SCHED_TTWU_QUEUE)
+#if defined(CONFIG_SMP)
 	if (sched_feat(TTWU_QUEUE) && cpu != smp_processor_id()) {
 		ttwu_queue_remote(p, cpu);
 		return;