* [PATCH] ARM: GIC: fix non-SMP builds
@ 2012-01-23 9:51 Marek Szyprowski
2012-01-23 9:57 ` Marc Zyngier
2012-01-23 12:36 ` Sergei Shtylyov
0 siblings, 2 replies; 5+ messages in thread
From: Marek Szyprowski @ 2012-01-23 9:51 UTC (permalink / raw)
To: linux-arm-kernel
This patch fixes the build break introduced by commit db0d4db22. It
happen only if SMP support has been disabled:
arch/arm/common/gic.c: In function 'gic_init_bases':
arch/arm/common/gic.c:679: error: implicit declaration of function 'cpu_logical_map'
make[1]: *** [arch/arm/common/gic.o] Error 1
make: *** [arch/arm/common] Error 2
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
arch/arm/common/gic.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c
index b2dc2dd..1a29555 100644
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
@@ -676,7 +676,10 @@ void __init gic_init_bases(unsigned int gic_nr, int irq_start,
}
for_each_possible_cpu(cpu) {
- unsigned long offset = percpu_offset * cpu_logical_map(cpu);
+ unsigned long offset = 0;
+#ifdef CONFIG_SMP
+ offset = percpu_offset * cpu_logical_map(cpu);
+#endif
*per_cpu_ptr(gic->dist_base.percpu_base, cpu) = dist_base + offset;
*per_cpu_ptr(gic->cpu_base.percpu_base, cpu) = cpu_base + offset;
}
--
1.7.1.569.g6f426
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH] ARM: GIC: fix non-SMP builds
2012-01-23 9:51 [PATCH] ARM: GIC: fix non-SMP builds Marek Szyprowski
@ 2012-01-23 9:57 ` Marc Zyngier
2012-01-23 10:16 ` Marek Szyprowski
2012-01-23 12:36 ` Sergei Shtylyov
1 sibling, 1 reply; 5+ messages in thread
From: Marc Zyngier @ 2012-01-23 9:57 UTC (permalink / raw)
To: linux-arm-kernel
On 23/01/12 09:51, Marek Szyprowski wrote:
> This patch fixes the build break introduced by commit db0d4db22. It
> happen only if SMP support has been disabled:
>
> arch/arm/common/gic.c: In function 'gic_init_bases':
> arch/arm/common/gic.c:679: error: implicit declaration of function 'cpu_logical_map'
> make[1]: *** [arch/arm/common/gic.o] Error 1
> make: *** [arch/arm/common] Error 2
>
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Please have a look at Will's patches:
http://patchwork.ozlabs.org/patch/136504/
which fix this problem in a far more elegant way.
M.
--
Jazz is not dead. It just smells funny...
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] ARM: GIC: fix non-SMP builds
2012-01-23 9:57 ` Marc Zyngier
@ 2012-01-23 10:16 ` Marek Szyprowski
2012-01-23 10:29 ` Marc Zyngier
0 siblings, 1 reply; 5+ messages in thread
From: Marek Szyprowski @ 2012-01-23 10:16 UTC (permalink / raw)
To: linux-arm-kernel
Hello,
On Monday, January 23, 2012 10:58 AM Marc Zyngier wrote:
> On 23/01/12 09:51, Marek Szyprowski wrote:
> > This patch fixes the build break introduced by commit db0d4db22. It
> > happen only if SMP support has been disabled:
> >
> > arch/arm/common/gic.c: In function 'gic_init_bases':
> > arch/arm/common/gic.c:679: error: implicit declaration of function 'cpu_logical_map'
> > make[1]: *** [arch/arm/common/gic.o] Error 1
> > make: *** [arch/arm/common] Error 2
> >
> > Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
>
> Please have a look at Will's patches:
> http://patchwork.ozlabs.org/patch/136504/
>
> which fix this problem in a far more elegant way.
Ok, thanks for the hint! I hope it will be merged to 3.3-rc2+ to fix the regression in
GIC code. If so, please ignore my patch.
Best regards
--
Marek Szyprowski
Samsung Poland R&D Center
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] ARM: GIC: fix non-SMP builds
2012-01-23 10:16 ` Marek Szyprowski
@ 2012-01-23 10:29 ` Marc Zyngier
0 siblings, 0 replies; 5+ messages in thread
From: Marc Zyngier @ 2012-01-23 10:29 UTC (permalink / raw)
To: linux-arm-kernel
On 23/01/12 10:16, Marek Szyprowski wrote:
> Hello,
>
> On Monday, January 23, 2012 10:58 AM Marc Zyngier wrote:
>
>> On 23/01/12 09:51, Marek Szyprowski wrote:
>>> This patch fixes the build break introduced by commit db0d4db22. It
>>> happen only if SMP support has been disabled:
>>>
>>> arch/arm/common/gic.c: In function 'gic_init_bases':
>>> arch/arm/common/gic.c:679: error: implicit declaration of function 'cpu_logical_map'
>>> make[1]: *** [arch/arm/common/gic.o] Error 1
>>> make: *** [arch/arm/common] Error 2
>>>
>>> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
>>> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
>>
>> Please have a look at Will's patches:
>> http://patchwork.ozlabs.org/patch/136504/
>>
>> which fix this problem in a far more elegant way.
>
> Ok, thanks for the hint! I hope it will be merged to 3.3-rc2+ to fix the regression in
> GIC code. If so, please ignore my patch.
It just got picked up by Russell, so I'd expect to see it being merged
upstream in a short while.
M.
--
Jazz is not dead. It just smells funny...
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] ARM: GIC: fix non-SMP builds
2012-01-23 9:51 [PATCH] ARM: GIC: fix non-SMP builds Marek Szyprowski
2012-01-23 9:57 ` Marc Zyngier
@ 2012-01-23 12:36 ` Sergei Shtylyov
1 sibling, 0 replies; 5+ messages in thread
From: Sergei Shtylyov @ 2012-01-23 12:36 UTC (permalink / raw)
To: linux-arm-kernel
Hello.
On 23-01-2012 13:51, Marek Szyprowski wrote:
> This patch fixes the build break introduced by commit db0d4db22. It
Please also specify the summary of that commit. Russell has recently again
explained why it's needed.
> happen only if SMP support has been disabled:
> arch/arm/common/gic.c: In function 'gic_init_bases':
> arch/arm/common/gic.c:679: error: implicit declaration of function 'cpu_logical_map'
> make[1]: *** [arch/arm/common/gic.o] Error 1
> make: *** [arch/arm/common] Error 2
> Signed-off-by: Marek Szyprowski<m.szyprowski@samsung.com>
> Signed-off-by: Kyungmin Park<kyungmin.park@samsung.com>
WBR, Sergei
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-01-23 12:36 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-23 9:51 [PATCH] ARM: GIC: fix non-SMP builds Marek Szyprowski
2012-01-23 9:57 ` Marc Zyngier
2012-01-23 10:16 ` Marek Szyprowski
2012-01-23 10:29 ` Marc Zyngier
2012-01-23 12:36 ` Sergei Shtylyov
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.