From patchwork Tue Apr 17 21:39:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 153326 X-Patchwork-Delegate: galak@kernel.crashing.org Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 705A0B70FC for ; Wed, 18 Apr 2012 07:40:25 +1000 (EST) Received: by ozlabs.org (Postfix) id 39C6BB7096; Wed, 18 Apr 2012 07:39:21 +1000 (EST) Delivered-To: linuxppc-dev@ozlabs.org Received: from db3outboundpool.messaging.microsoft.com (db3ehsobe002.messaging.microsoft.com [213.199.154.140]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (Client CN "mail.global.frontbridge.com", Issuer "Microsoft Secure Server Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 75FEDB7095 for ; Wed, 18 Apr 2012 07:39:19 +1000 (EST) Received: from mail97-db3-R.bigfish.com (10.3.81.235) by DB3EHSOBE004.bigfish.com (10.3.84.24) with Microsoft SMTP Server id 14.1.225.23; Tue, 17 Apr 2012 21:39:15 +0000 Received: from mail97-db3 (localhost [127.0.0.1]) by mail97-db3-R.bigfish.com (Postfix) with ESMTP id AF73B4A016C for ; Tue, 17 Apr 2012 21:39:15 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275bhz2dh2a8h668h839hd24h) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI Received: from mail97-db3 (localhost.localdomain [127.0.0.1]) by mail97-db3 (MessageSwitch) id 1334698752525771_31582; Tue, 17 Apr 2012 21:39:12 +0000 (UTC) Received: from DB3EHSMHS009.bigfish.com (unknown [10.3.81.227]) by mail97-db3.bigfish.com (Postfix) with ESMTP id 7C0571E0048 for ; Tue, 17 Apr 2012 21:39:12 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by DB3EHSMHS009.bigfish.com (10.3.87.109) with Microsoft SMTP Server (TLS) id 14.1.225.23; Tue, 17 Apr 2012 21:39:11 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server (TLS) id 14.1.355.3; Tue, 17 Apr 2012 16:39:10 -0500 Received: from localhost.localdomain ([10.214.80.9]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id q3HLd7G8009283; Tue, 17 Apr 2012 14:39:09 -0700 From: York Sun To: Subject: [PATCH] powerpc/85xx: Add back condition for smp Date: Tue, 17 Apr 2012 14:39:06 -0700 Message-ID: <1334698746-11529-1-git-send-email-yorksun@freescale.com> X-Mailer: git-send-email 1.7.0.4 MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org The timebase synchronization is only necessary if we need to reset a separate core. Currently only KEXEC and CPU hotplug require resetting a single core. The following code should be in the condition of CONFIG_KEXEC or CONFIG_HOTPLUG_CPU .give_timebase = smp_generic_give_timebase, .take_timebase = smp_generic_take_timebase, Signed-off-by: York Sun Acked-by: Li Yang --- arch/powerpc/platforms/85xx/smp.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c index 56942af..868c6d7 100644 --- a/arch/powerpc/platforms/85xx/smp.c +++ b/arch/powerpc/platforms/85xx/smp.c @@ -192,8 +192,10 @@ struct smp_ops_t smp_85xx_ops = { .cpu_disable = generic_cpu_disable, .cpu_die = generic_cpu_die, #endif +#if defined(CONFIG_KEXEC) || defined(CONFIG_HOTPLUG_CPU) .give_timebase = smp_generic_give_timebase, .take_timebase = smp_generic_take_timebase, +#endif }; #ifdef CONFIG_KEXEC