From patchwork Fri Nov 4 12:29:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chenhui zhao X-Patchwork-Id: 123615 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 1A3B3B6FD1 for ; Fri, 4 Nov 2011 23:30:19 +1100 (EST) Received: from ch1outboundpool.messaging.microsoft.com (ch1ehsobe006.messaging.microsoft.com [216.32.181.186]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (Client CN "mail.global.frontbridge.com", Issuer "Microsoft Secure Server Authority" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id 97BB1B6F89 for ; Fri, 4 Nov 2011 23:29:56 +1100 (EST) Received: from mail84-ch1-R.bigfish.com (10.43.68.246) by CH1EHSOBE010.bigfish.com (10.43.70.60) with Microsoft SMTP Server id 14.1.225.22; Fri, 4 Nov 2011 12:29:31 +0000 Received: from mail84-ch1 (localhost.localdomain [127.0.0.1]) by mail84-ch1-R.bigfish.com (Postfix) with ESMTP id 9536515502B6 for ; Fri, 4 Nov 2011 12:29:40 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275bhz2dh2a8h668h839h) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPVD:NLI; H:mail.freescale.net; RD:none; EFVD:NLI Received: from mail84-ch1 (localhost.localdomain [127.0.0.1]) by mail84-ch1 (MessageSwitch) id 1320409778518238_9483; Fri, 4 Nov 2011 12:29:38 +0000 (UTC) Received: from CH1EHSMHS015.bigfish.com (snatpool1.int.messaging.microsoft.com [10.43.68.244]) by mail84-ch1.bigfish.com (Postfix) with ESMTP id 7988D166004C for ; Fri, 4 Nov 2011 12:29:38 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CH1EHSMHS015.bigfish.com (10.43.70.15) with Microsoft SMTP Server (TLS) id 14.1.225.22; Fri, 4 Nov 2011 12:29:44 +0000 Received: from az33smr02.freescale.net (10.64.34.200) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server id 14.1.339.2; Fri, 4 Nov 2011 07:29:43 -0500 Received: from localhost.localdomain ([10.193.20.166]) by az33smr02.freescale.net (8.13.1/8.13.0) with ESMTP id pA4CTeOg019791; Fri, 4 Nov 2011 07:29:41 -0500 (CDT) From: Zhao Chenhui To: Subject: [PATCH 1/7] powerpc/85xx: re-enable timebase sync disabled by KEXEC patch Date: Fri, 4 Nov 2011 20:29:47 +0800 Message-ID: <1320409787-14360-1-git-send-email-chenhui.zhao@freescale.com> X-Mailer: git-send-email 1.6.4.1 MIME-Version: 1.0 X-OriginatorOrg: freescale.com Cc: chenhui.zhao@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 From: Li Yang The timebase sync is not only necessary when using KEXEC. It should also be used by normal boot up and cpu hotplug. Remove the ifdef added by the KEXEC patch. Signed-off-by: Jin Qing Signed-off-by: Li Yang --- arch/powerpc/platforms/85xx/smp.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c index 5b9b901..9b0de9c 100644 --- a/arch/powerpc/platforms/85xx/smp.c +++ b/arch/powerpc/platforms/85xx/smp.c @@ -113,10 +113,8 @@ smp_85xx_kick_cpu(int nr) struct smp_ops_t smp_85xx_ops = { .kick_cpu = smp_85xx_kick_cpu, -#ifdef CONFIG_KEXEC .give_timebase = smp_generic_give_timebase, .take_timebase = smp_generic_take_timebase, -#endif }; #ifdef CONFIG_KEXEC