* [PATCH] ARM: EXYNOS: fix typo in static struct name "exynos5_list_diable_wfi_wfe"
@ 2014-10-28 9:50 ` Pankaj Dubey
0 siblings, 0 replies; 14+ messages in thread
From: Pankaj Dubey @ 2014-10-28 9:50 UTC (permalink / raw)
To: linux-arm-kernel, linux-samsung-soc
Cc: kgene.kim, linux, thomas.ab, Pankaj Dubey
This patch fixes a typo in struct named as "exynos5_list_diable_wfi_wfe"
by making it "exynos5_list_disable_wfi_wfe" which is more meaningful.
Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com>
---
arch/arm/mach-exynos/pmu.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-exynos/pmu.c b/arch/arm/mach-exynos/pmu.c
index cfc62e8..e5e1846 100644
--- a/arch/arm/mach-exynos/pmu.c
+++ b/arch/arm/mach-exynos/pmu.c
@@ -330,7 +330,7 @@ static unsigned int const exynos5_list_both_cnt_feed[] = {
EXYNOS5_TOP_PWR_SYSMEM_OPTION,
};
-static unsigned int const exynos5_list_diable_wfi_wfe[] = {
+static unsigned int const exynos5_list_disable_wfi_wfe[] = {
EXYNOS5_ARM_CORE1_OPTION,
EXYNOS5_FSYS_ARM_OPTION,
EXYNOS5_ISP_ARM_OPTION,
@@ -361,11 +361,11 @@ static void exynos5_init_pmu(void)
/*
* Disable WFI/WFE on XXX_OPTION
*/
- for (i = 0 ; i < ARRAY_SIZE(exynos5_list_diable_wfi_wfe) ; i++) {
- tmp = pmu_raw_readl(exynos5_list_diable_wfi_wfe[i]);
+ for (i = 0 ; i < ARRAY_SIZE(exynos5_list_disable_wfi_wfe) ; i++) {
+ tmp = pmu_raw_readl(exynos5_list_disable_wfi_wfe[i]);
tmp &= ~(EXYNOS5_OPTION_USE_STANDBYWFE |
EXYNOS5_OPTION_USE_STANDBYWFI);
- pmu_raw_writel(tmp, exynos5_list_diable_wfi_wfe[i]);
+ pmu_raw_writel(tmp, exynos5_list_disable_wfi_wfe[i]);
}
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH] ARM: EXYNOS: fix typo in static struct name "exynos5_list_diable_wfi_wfe"
@ 2014-10-28 9:50 ` Pankaj Dubey
0 siblings, 0 replies; 14+ messages in thread
From: Pankaj Dubey @ 2014-10-28 9:50 UTC (permalink / raw)
To: linux-arm-kernel
This patch fixes a typo in struct named as "exynos5_list_diable_wfi_wfe"
by making it "exynos5_list_disable_wfi_wfe" which is more meaningful.
Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com>
---
arch/arm/mach-exynos/pmu.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-exynos/pmu.c b/arch/arm/mach-exynos/pmu.c
index cfc62e8..e5e1846 100644
--- a/arch/arm/mach-exynos/pmu.c
+++ b/arch/arm/mach-exynos/pmu.c
@@ -330,7 +330,7 @@ static unsigned int const exynos5_list_both_cnt_feed[] = {
EXYNOS5_TOP_PWR_SYSMEM_OPTION,
};
-static unsigned int const exynos5_list_diable_wfi_wfe[] = {
+static unsigned int const exynos5_list_disable_wfi_wfe[] = {
EXYNOS5_ARM_CORE1_OPTION,
EXYNOS5_FSYS_ARM_OPTION,
EXYNOS5_ISP_ARM_OPTION,
@@ -361,11 +361,11 @@ static void exynos5_init_pmu(void)
/*
* Disable WFI/WFE on XXX_OPTION
*/
- for (i = 0 ; i < ARRAY_SIZE(exynos5_list_diable_wfi_wfe) ; i++) {
- tmp = pmu_raw_readl(exynos5_list_diable_wfi_wfe[i]);
+ for (i = 0 ; i < ARRAY_SIZE(exynos5_list_disable_wfi_wfe) ; i++) {
+ tmp = pmu_raw_readl(exynos5_list_disable_wfi_wfe[i]);
tmp &= ~(EXYNOS5_OPTION_USE_STANDBYWFE |
EXYNOS5_OPTION_USE_STANDBYWFI);
- pmu_raw_writel(tmp, exynos5_list_diable_wfi_wfe[i]);
+ pmu_raw_writel(tmp, exynos5_list_disable_wfi_wfe[i]);
}
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* RE: [PATCH] ARM: EXYNOS: fix typo in static struct name "exynos5_list_diable_wfi_wfe"
2014-10-28 9:50 ` Pankaj Dubey
@ 2014-10-28 10:33 ` Kukjin Kim
-1 siblings, 0 replies; 14+ messages in thread
From: Kukjin Kim @ 2014-10-28 10:33 UTC (permalink / raw)
To: 'Pankaj Dubey', linux-arm-kernel, linux-samsung-soc
Cc: linux, thomas.ab
Pankaj Dubey wrote:
>
> This patch fixes a typo in struct named as "exynos5_list_diable_wfi_wfe"
> by making it "exynos5_list_disable_wfi_wfe" which is more meaningful.
>
Yes, 'disable' is more meaningful ;)
I'll apply this into non-critical-fixes for 3.19.
Thanks,
Kukjin
> Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com>
> ---
> arch/arm/mach-exynos/pmu.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-exynos/pmu.c b/arch/arm/mach-exynos/pmu.c
> index cfc62e8..e5e1846 100644
> --- a/arch/arm/mach-exynos/pmu.c
> +++ b/arch/arm/mach-exynos/pmu.c
> @@ -330,7 +330,7 @@ static unsigned int const exynos5_list_both_cnt_feed[] = {
> EXYNOS5_TOP_PWR_SYSMEM_OPTION,
> };
>
> -static unsigned int const exynos5_list_diable_wfi_wfe[] = {
> +static unsigned int const exynos5_list_disable_wfi_wfe[] = {
> EXYNOS5_ARM_CORE1_OPTION,
> EXYNOS5_FSYS_ARM_OPTION,
> EXYNOS5_ISP_ARM_OPTION,
> @@ -361,11 +361,11 @@ static void exynos5_init_pmu(void)
> /*
> * Disable WFI/WFE on XXX_OPTION
> */
> - for (i = 0 ; i < ARRAY_SIZE(exynos5_list_diable_wfi_wfe) ; i++) {
> - tmp = pmu_raw_readl(exynos5_list_diable_wfi_wfe[i]);
> + for (i = 0 ; i < ARRAY_SIZE(exynos5_list_disable_wfi_wfe) ; i++) {
> + tmp = pmu_raw_readl(exynos5_list_disable_wfi_wfe[i]);
> tmp &= ~(EXYNOS5_OPTION_USE_STANDBYWFE |
> EXYNOS5_OPTION_USE_STANDBYWFI);
> - pmu_raw_writel(tmp, exynos5_list_diable_wfi_wfe[i]);
> + pmu_raw_writel(tmp, exynos5_list_disable_wfi_wfe[i]);
> }
> }
>
> --
> 1.7.9.5
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH] ARM: EXYNOS: fix typo in static struct name "exynos5_list_diable_wfi_wfe"
@ 2014-10-28 10:33 ` Kukjin Kim
0 siblings, 0 replies; 14+ messages in thread
From: Kukjin Kim @ 2014-10-28 10:33 UTC (permalink / raw)
To: linux-arm-kernel
Pankaj Dubey wrote:
>
> This patch fixes a typo in struct named as "exynos5_list_diable_wfi_wfe"
> by making it "exynos5_list_disable_wfi_wfe" which is more meaningful.
>
Yes, 'disable' is more meaningful ;)
I'll apply this into non-critical-fixes for 3.19.
Thanks,
Kukjin
> Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com>
> ---
> arch/arm/mach-exynos/pmu.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-exynos/pmu.c b/arch/arm/mach-exynos/pmu.c
> index cfc62e8..e5e1846 100644
> --- a/arch/arm/mach-exynos/pmu.c
> +++ b/arch/arm/mach-exynos/pmu.c
> @@ -330,7 +330,7 @@ static unsigned int const exynos5_list_both_cnt_feed[] = {
> EXYNOS5_TOP_PWR_SYSMEM_OPTION,
> };
>
> -static unsigned int const exynos5_list_diable_wfi_wfe[] = {
> +static unsigned int const exynos5_list_disable_wfi_wfe[] = {
> EXYNOS5_ARM_CORE1_OPTION,
> EXYNOS5_FSYS_ARM_OPTION,
> EXYNOS5_ISP_ARM_OPTION,
> @@ -361,11 +361,11 @@ static void exynos5_init_pmu(void)
> /*
> * Disable WFI/WFE on XXX_OPTION
> */
> - for (i = 0 ; i < ARRAY_SIZE(exynos5_list_diable_wfi_wfe) ; i++) {
> - tmp = pmu_raw_readl(exynos5_list_diable_wfi_wfe[i]);
> + for (i = 0 ; i < ARRAY_SIZE(exynos5_list_disable_wfi_wfe) ; i++) {
> + tmp = pmu_raw_readl(exynos5_list_disable_wfi_wfe[i]);
> tmp &= ~(EXYNOS5_OPTION_USE_STANDBYWFE |
> EXYNOS5_OPTION_USE_STANDBYWFI);
> - pmu_raw_writel(tmp, exynos5_list_diable_wfi_wfe[i]);
> + pmu_raw_writel(tmp, exynos5_list_disable_wfi_wfe[i]);
> }
> }
>
> --
> 1.7.9.5
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] ARM: EXYNOS: fix typo in static struct name "exynos5_list_diable_wfi_wfe"
2014-10-28 9:50 ` Pankaj Dubey
@ 2014-11-11 9:44 ` Javier Martinez Canillas
-1 siblings, 0 replies; 14+ messages in thread
From: Javier Martinez Canillas @ 2014-11-11 9:44 UTC (permalink / raw)
To: Pankaj Dubey, Kukjin Kim
Cc: linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org, Russell King, thomas.ab
Hello Pankaj, Kukjin,
On Tue, Oct 28, 2014 at 10:50 AM, Pankaj Dubey <pankaj.dubey@samsung.com> wrote:
> This patch fixes a typo in struct named as "exynos5_list_diable_wfi_wfe"
> by making it "exynos5_list_disable_wfi_wfe" which is more meaningful.
>
> Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com>
After this patch, "[PATCH v9 1/2] ARM: EXYNOS: Add platform driver
support for Exynos PMU" [0] does not apply cleanly anymore.
Pankaj,
Are you planning to rebase and re-post that patch?
Kukjin,
It would be great if you can pick all the pending Exynos5420 S2R
patches to avoid these kind of conflicts.
Thanks a lot and best regards,
Javier
[0]: https://lkml.org/lkml/2014/10/6/90
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH] ARM: EXYNOS: fix typo in static struct name "exynos5_list_diable_wfi_wfe"
@ 2014-11-11 9:44 ` Javier Martinez Canillas
0 siblings, 0 replies; 14+ messages in thread
From: Javier Martinez Canillas @ 2014-11-11 9:44 UTC (permalink / raw)
To: linux-arm-kernel
Hello Pankaj, Kukjin,
On Tue, Oct 28, 2014 at 10:50 AM, Pankaj Dubey <pankaj.dubey@samsung.com> wrote:
> This patch fixes a typo in struct named as "exynos5_list_diable_wfi_wfe"
> by making it "exynos5_list_disable_wfi_wfe" which is more meaningful.
>
> Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com>
After this patch, "[PATCH v9 1/2] ARM: EXYNOS: Add platform driver
support for Exynos PMU" [0] does not apply cleanly anymore.
Pankaj,
Are you planning to rebase and re-post that patch?
Kukjin,
It would be great if you can pick all the pending Exynos5420 S2R
patches to avoid these kind of conflicts.
Thanks a lot and best regards,
Javier
[0]: https://lkml.org/lkml/2014/10/6/90
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] ARM: EXYNOS: fix typo in static struct name "exynos5_list_diable_wfi_wfe"
2014-11-11 9:44 ` Javier Martinez Canillas
@ 2014-11-11 9:54 ` Javier Martinez Canillas
-1 siblings, 0 replies; 14+ messages in thread
From: Javier Martinez Canillas @ 2014-11-11 9:54 UTC (permalink / raw)
To: Kukjin Kim, Pankaj Dubey
Cc: linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org, Russell King, thomas.ab
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.
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.
Best regards,
Javier
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH] ARM: EXYNOS: fix typo in static struct name "exynos5_list_diable_wfi_wfe"
@ 2014-11-11 9:54 ` Javier Martinez Canillas
0 siblings, 0 replies; 14+ messages in thread
From: Javier Martinez Canillas @ 2014-11-11 9:54 UTC (permalink / raw)
To: linux-arm-kernel
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.
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.
Best regards,
Javier
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] ARM: EXYNOS: fix typo in static struct name "exynos5_list_diable_wfi_wfe"
2014-11-11 9:54 ` Javier Martinez Canillas
@ 2014-11-13 2:40 ` Kukjin Kim
-1 siblings, 0 replies; 14+ messages in thread
From: Kukjin Kim @ 2014-11-13 2:40 UTC (permalink / raw)
To: Javier Martinez Canillas
Cc: Kukjin Kim, Pankaj Dubey, linux-samsung-soc@vger.kernel.org,
Russell King, thomas.ab, linux-arm-kernel@lists.infradead.org
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.
> 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
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH] ARM: EXYNOS: fix typo in static struct name "exynos5_list_diable_wfi_wfe"
@ 2014-11-13 2:40 ` Kukjin Kim
0 siblings, 0 replies; 14+ messages in thread
From: Kukjin Kim @ 2014-11-13 2:40 UTC (permalink / raw)
To: linux-arm-kernel
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.
> 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
^ permalink raw reply [flat|nested] 14+ messages in thread
* RE: [PATCH] ARM: EXYNOS: fix typo in static struct name "exynos5_list_diable_wfi_wfe"
2014-11-13 2:40 ` Kukjin Kim
@ 2014-11-13 4:27 ` Pankaj Dubey
-1 siblings, 0 replies; 14+ messages in thread
From: Pankaj Dubey @ 2014-11-13 4:27 UTC (permalink / raw)
To: 'Kukjin Kim', 'Javier Martinez Canillas'
Cc: linux-samsung-soc, 'Russell King', thomas.ab,
linux-arm-kernel
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:
----------
<stdin>: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.
----------------------------------------------------------------------------
--
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);
-------------------------------------------------------------------------
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
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH] ARM: EXYNOS: fix typo in static struct name "exynos5_list_diable_wfi_wfe"
@ 2014-11-13 4:27 ` Pankaj Dubey
0 siblings, 0 replies; 14+ messages in thread
From: Pankaj Dubey @ 2014-11-13 4:27 UTC (permalink / raw)
To: linux-arm-kernel
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:
----------
<stdin>: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.
----------------------------------------------------------------------------
--
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);
-------------------------------------------------------------------------
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
^ permalink raw reply related [flat|nested] 14+ messages in thread* RE: [PATCH] ARM: EXYNOS: fix typo in static struct name "exynos5_list_diable_wfi_wfe"
2014-11-13 4:27 ` Pankaj Dubey
@ 2014-11-13 4:42 ` Kukjin Kim
-1 siblings, 0 replies; 14+ messages in thread
From: Kukjin Kim @ 2014-11-13 4:42 UTC (permalink / raw)
To: 'Pankaj Dubey', 'Javier Martinez Canillas'
Cc: linux-samsung-soc, 'Russell King', thomas.ab,
linux-arm-kernel
Pankaj Dubey wrote:
>
> Hi Kukijin,
>
Hi,
> 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:
> ----------
> <stdin>: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.
> ----------------------------------------------------------------------------
> --
> 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);
> -------------------------------------------------------------------------
>
> Let me know if I have to do something? else please update according to
> above change.
>
Oops, it's my mistake. I'll fix it up as soon as possible...
Thanks,
Kukjin
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH] ARM: EXYNOS: fix typo in static struct name "exynos5_list_diable_wfi_wfe"
@ 2014-11-13 4:42 ` Kukjin Kim
0 siblings, 0 replies; 14+ messages in thread
From: Kukjin Kim @ 2014-11-13 4:42 UTC (permalink / raw)
To: linux-arm-kernel
Pankaj Dubey wrote:
>
> Hi Kukijin,
>
Hi,
> 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:
> ----------
> <stdin>: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.
> ----------------------------------------------------------------------------
> --
> 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);
> -------------------------------------------------------------------------
>
> Let me know if I have to do something? else please update according to
> above change.
>
Oops, it's my mistake. I'll fix it up as soon as possible...
Thanks,
Kukjin
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2014-11-13 4:42 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-28 9:50 [PATCH] ARM: EXYNOS: fix typo in static struct name "exynos5_list_diable_wfi_wfe" Pankaj Dubey
2014-10-28 9:50 ` Pankaj Dubey
2014-10-28 10:33 ` Kukjin Kim
2014-10-28 10:33 ` Kukjin Kim
2014-11-11 9:44 ` Javier Martinez Canillas
2014-11-11 9:44 ` Javier Martinez Canillas
2014-11-11 9:54 ` Javier Martinez Canillas
2014-11-11 9:54 ` Javier Martinez Canillas
2014-11-13 2:40 ` Kukjin Kim
2014-11-13 2:40 ` Kukjin Kim
2014-11-13 4:27 ` Pankaj Dubey
2014-11-13 4:27 ` Pankaj Dubey
2014-11-13 4:42 ` Kukjin Kim
2014-11-13 4:42 ` Kukjin Kim
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.