From patchwork Thu Nov 13 04:27:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pankaj Dubey X-Patchwork-Id: 5293641 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EA6C09F2ED for ; Thu, 13 Nov 2014 04:28:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 22461201F2 for ; Thu, 13 Nov 2014 04:28:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B2DDB201C8 for ; Thu, 13 Nov 2014 04:28:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753651AbaKME2E (ORCPT ); Wed, 12 Nov 2014 23:28:04 -0500 Received: from mailout4.samsung.com ([203.254.224.34]:46314 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753579AbaKME2D (ORCPT ); Wed, 12 Nov 2014 23:28:03 -0500 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NEY00ABIN2M0700@mailout4.samsung.com> for linux-samsung-soc@vger.kernel.org; Thu, 13 Nov 2014 13:27:58 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.123]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id 28.BB.18167.E4334645; Thu, 13 Nov 2014 13:27:58 +0900 (KST) X-AuditID: cbfee690-f79ab6d0000046f7-b7-5464334e1c17 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id B6.B3.09430.E4334645; Thu, 13 Nov 2014 13:27:58 +0900 (KST) Received: from pankajdubey ([107.108.83.134]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0NEY00G2RN1PR130@mmp2.samsung.com>; Thu, 13 Nov 2014 13:27:58 +0900 (KST) From: Pankaj Dubey To: 'Kukjin Kim' , 'Javier Martinez Canillas' Cc: linux-samsung-soc@vger.kernel.org, 'Russell King' , thomas.ab@samsung.com, linux-arm-kernel@lists.infradead.org References: <1414489832-28011-1-git-send-email-pankaj.dubey@samsung.com> <54641A05.9030107@samsung.com> In-reply-to: <54641A05.9030107@samsung.com> Subject: RE: [PATCH] ARM: EXYNOS: fix typo in static struct name "exynos5_list_diable_wfi_wfe" Date: Thu, 13 Nov 2014 09:57:29 +0530 Message-id: <000d01cffefa$3688d550$a39a7ff0$@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit X-Mailer: Microsoft Outlook 14.0 Thread-index: AQG1DoU6ULo+ycpJ/74/oqwm6dnoPQGfWY/KAc0fvKkCVcpdBZxlworg Content-language: en-us X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrIIsWRmVeSWpSXmKPExsWyRsSkWtfPOCXE4NgvRYtrv2ewWfQuuMpm senxNVaLGef3MVncvsxr0bGM0YHNo6W5h83j7+xWZo/NS+o9+rasYvT4vEkugDWKyyYlNSez LLVI3y6BK+Nh/wKWglciFbuPT2dqYOwT7GLk5JAQMJG48WcbO4QtJnHh3no2EFtIYCmjxOx2 ZZia9Y+vs3QxcgHFpzNK7F51D8r5yyixoP0rE0gVm4CuxJP3c5lBbBGBGIkvB3eCFTEL9DJK zJt3lxGi4zujRO+ZKWA7OAW0Je4+mcIKYgsLJEi8PdQP1s0ioCox7fcisKm8ApYS5358YIew BSV+TAZZzQk0VUti/c7jTBC2vMTmNW+ZIW5VkNhx9jUjxBVuEg+/7GGDqBGXmPTgITvIERIC 99glNq+cywaxTEDi2+RDQEM5gBKyEpsOQM2RlDi44gbLBEaJWUhWz0KyehaS1bOQrFjAyLKK UTS1ILmgOCm9yESvODG3uDQvXS85P3cTIzBmT/97NmEH470D1ocYBTgYlXh4X7KkhAixJpYV V+YeYjQFumgis5Rocj4wMeSVxBsamxlZmJqYGhuZW5opifO+lvoZLCSQnliSmp2aWpBaFF9U mpNafIiRiYNTqoHRZ2vmyUlpx4ofi03cdbTC8ba6zfzNTWkb7t/Wj7+bKrK4bJvj/34xTs+N LIcZOFY+VZOtv/j1F/eNTZqzr6cu0+WZNL998wLrNMdv/BZfXRcJa0Xr88r47HwZ/Jx1X8O8 hgrTCXO9+wOnJ2022XKk7fZH99rnzw47Lus41bsmJfNsi8+J5K3aSizFGYmGWsxFxYkAieQZ FtQCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuphleLIzCtJLcpLzFFi42I5/e+xoK6fcUqIwc+z0hbXfs9gs+hdcJXN YtPja6wWM87vY7K4fZnXomMZowObR0tzD5vH39mtzB6bl9R79G1ZxejxeZNcAGtUA6NNRmpi SmqRQmpecn5KZl66rZJ3cLxzvKmZgaGuoaWFuZJCXmJuqq2Si0+ArltmDtB+JYWyxJxSoFBA YnGxkr4dpgmhIW66FjCNEbq+IUFwPUYGaCBhDWPGw/4FLAWvRCp2H5/O1MDYJ9jFyMkhIWAi sf7xdRYIW0ziwr31bF2MXBxCAtMZJXavuscC4fxllFjQ/pUJpIpNQFfiyfu5zCC2iECMxJeD O8GKmAV6GSXmzbvLCNHxnVGi98wUNpAqTgFtibtPprCC2MICCRJvD/WDdbMIqEpM+70IbCqv gKXEuR8f2CFsQYkfk++B3cQsoCWxfudxJghbXmLzmrfMELcqSOw4+5oR4go3iYdf9rBB1IhL THrwkH0Co9AsJKNmIRk1C8moWUhaFjCyrGIUTS1ILihOSs810itOzC0uzUvXS87P3cQITgnP pHcwrmqwOMQowMGoxMP7giUlRIg1say4MvcQowQHs5IIb5MOUIg3JbGyKrUoP76oNCe1+BCj KdCnE5mlRJPzgekqryTe0NjE3NTY1NLEwsTMUkmc92CrdaCQQHpiSWp2ampBahFMHxMHp1QD I//hTmauuPmyIRcOqB/9Hn1VJnTnisVH9F4eWO0jviT+slCSeqfS/+t8NatnaTx+77KL77n6 55kNX7Z6BOzgVC+/P+Nb1f9/TlwLU6VsPbO677xknLb4tf/q2fzGNlMyjoStYOhb8n72pBtr zE67VW9bYMaT3b9OZ/eSo/zTH3y/si03pnROL4cSS3FGoqEWc1FxIgDkU5A7HwMAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Kukijin, On Thursday, November 13, 2014 8:10 AM, Kukjin Kim wrote: > Subject: Re: [PATCH] ARM: EXYNOS: fix typo in static struct name > "exynos5_list_diable_wfi_wfe" > > On 11/11/14 18:54, Javier Martinez Canillas wrote: > > Hello Kukjin, > > > >> > >> After this patch, "[PATCH v9 1/2] ARM: EXYNOS: Add platform driver > >> support for Exynos PMU" [0] does not apply cleanly anymore. > >> > > > > I see that you already picked all the Exynos S2R patches on your > > v3.19-next/mach-exynos branch and also resolved that conflict. > > > Yes, but I couldn't merge it into -next because of some conflicts between for-next and > mach-exynos branch at that time. > > Note I've merged into -next just now, so if any problems in -next, please let us know. > I just checked and your for-next failed to compile for exynos_defconfig. I got following error: ---------- :1247:2: warning: #warning syscall bpf not implemented [-Wcpp] CHK include/generated/compile.h CC arch/arm/mach-exynos/platsmp.o arch/arm/mach-exynos/platsmp.c:448:13: error: static declaration of 'exynos_cpu_die' follows non-static declaration static void exynos_cpu_die(unsigned int cpu) ^ In file included from arch/arm/mach-exynos/platsmp.c:32:0: arch/arm/mach-exynos/common.h:142:13: note: previous declaration of 'exynos_cpu_die' was here extern void exynos_cpu_die(unsigned int cpu); ^ make[1]: *** [arch/arm/mach-exynos/platsmp.o] Error 1 make: *** [arch/arm/mach-exynos] Error 2 make: *** Waiting for unfinished jobs.... -------------------------- With following fix I am able to build the for-next. ---------------------------------------------------------------------------- --- ------------------------------------------------------------------------- Let me know if I have to do something? else please update according to above change. Thanks, Pankaj Dubey > > Is just that this branch was not merged in your for-next branch and > > that's why I didn't see the patches in linux-next. > > > > Sorry for the noise. > > No problem, thanks. > > - Kukjin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h index 2ce225b..472417c 100644 --- a/arch/arm/mach-exynos/common.h +++ b/arch/arm/mach-exynos/common.h @@ -139,7 +139,6 @@ extern struct smp_operations exynos_smp_ops; extern void exynos_cpu_resume(void); extern void exynos_cpu_resume_ns(void); -extern void exynos_cpu_die(unsigned int cpu); extern void exynos_cpu_power_down(int cpu); extern void exynos_cpu_power_up(int cpu); extern int exynos_cpu_power_state(int cpu);