From patchwork Thu Apr 19 09:22:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Eisele X-Patchwork-Id: 153710 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3EC72B6FDC for ; Thu, 19 Apr 2012 19:32:35 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753938Ab2DSJce (ORCPT ); Thu, 19 Apr 2012 05:32:34 -0400 Received: from mail175c2.megamailservers.com ([69.49.111.75]:58694 "EHLO mail175c2.megamailservers.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752881Ab2DSJcd (ORCPT ); Thu, 19 Apr 2012 05:32:33 -0400 X-Authenticated-User: konrad.gaisler.com Received: from localhost.localdomain (gaisler.se [92.33.28.242]) (authenticated bits=0) by mail175c2.megamailservers.com (8.13.6/8.13.1) with ESMTP id q3J9WMEn019499; Thu, 19 Apr 2012 05:32:26 -0400 From: Konrad Eisele To: sparclinux@vger.kernel.org, davem@davemloft.net Cc: daniel@gaisler.com, sam@ravnborg.org, konrad@gaisler.com Subject: [PATCH 1/1] sparc: task_cpu() for stopper thread on sparc32 returns 0 Date: Thu, 19 Apr 2012 11:22:42 +0200 Message-Id: <1334827362-3434-1-git-send-email-konrad@gaisler.com> X-Mailer: git-send-email 1.6.1.3 X-CSC: 0 X-CHA: v=1.1 cv=0l1ZA7H7kdVYwsUDqKdyt3M1kbawXr/ph8StbAMu7Y4= c=1 sm=1 a=ji7vZ4c5EMYA:10 a=U62ajLuCel8A:10 a=jXKJviUpWSOlMmIvGrHOfw==:17 a=ebG-ZW-8AAAA:8 a=kmN8l1tT5BUQY9XjjE8A:9 a=cCYF7-FHeg4A:10 a=jXKJviUpWSOlMmIvGrHOfw==:117 X-CTCH-Spam: Unknown X-CTCH-RefID: str=0001.0A020209.4F8FDBAB.010D, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-WHL: SLR Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org The stopper thread for CPU > 0 (at least in sparc32) has on initialization task_cpu() set to zero even for CPUs > 0. The patch explicitly checks weather the CPU is allowed to run on the cpu that task_cpu() return or changes the return cpu. Signed-off-by: Konrad Eisele --- kernel/sched/stop_task.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/kernel/sched/stop_task.c b/kernel/sched/stop_task.c index 7b386e8..9201866 100644 --- a/kernel/sched/stop_task.c +++ b/kernel/sched/stop_task.c @@ -13,7 +13,14 @@ static int select_task_rq_stop(struct task_struct *p, int sd_flag, int flags) { - return task_cpu(p); /* stop tasks as never migrate */ + int ccpu, cpu , dcpu; + ccpu = cpu = task_cpu(p); + if (unlikely(!cpumask_test_cpu(cpu, tsk_cpus_allowed(p)))) { + cpu = cpumask_first(tsk_cpus_allowed(p)); + if (cpu >= nr_cpu_ids) + cpu = ccpu; + } + return cpu; } #endif /* CONFIG_SMP */