| Message ID | 1365461538-30702-5-git-send-email-gregory.clement@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Apr 09, 2013 at 12:52:12AM +0200, Gregory CLEMENT wrote: > From: Lior Amsalem <alior@marvell.com> > > pj4b cpus are LPAE capable so enable them on LPAE compilations > > Signed-off-by: Lior Amsalem <alior@marvell.com> > Tested-by: Franklin <flin@marvell.com> > Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> > --- > arch/arm/mm/proc-v7.S | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Applied to mvebu/soc thx, Jason.
Hi Jason, On 04/11/2013 08:08 PM, Jason Cooper wrote: > On Tue, Apr 09, 2013 at 12:52:12AM +0200, Gregory CLEMENT wrote: >> From: Lior Amsalem <alior@marvell.com> >> >> pj4b cpus are LPAE capable so enable them on LPAE compilations >> >> Signed-off-by: Lior Amsalem <alior@marvell.com> >> Tested-by: Franklin <flin@marvell.com> >> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> >> --- >> arch/arm/mm/proc-v7.S | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) > > Applied to mvebu/soc > > thx, > > Jason. > First thanks for pulling all these patches. However, this one should go through Russell's git tree. Or at least you need his acked-by. I have already submit this patch on Russell patch system. Unfortunately Russell told that he will be away for around one week. This patch is needed to have LPAE support, but all the other patches don't depend on it. That means that if you applied all the other patches it won't break anything even if at the end this patch is not merged. But I really hope that Russell will be able to apply this patch to his git tree. Thanks
On Thu, Apr 11, 2013 at 10:41:34PM +0200, Gregory CLEMENT wrote: > Hi Jason, > > On 04/11/2013 08:08 PM, Jason Cooper wrote: > > On Tue, Apr 09, 2013 at 12:52:12AM +0200, Gregory CLEMENT wrote: > >> From: Lior Amsalem <alior@marvell.com> > >> > >> pj4b cpus are LPAE capable so enable them on LPAE compilations > >> > >> Signed-off-by: Lior Amsalem <alior@marvell.com> > >> Tested-by: Franklin <flin@marvell.com> > >> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> > >> --- > >> arch/arm/mm/proc-v7.S | 3 ++- > >> 1 file changed, 2 insertions(+), 1 deletion(-) > > > > Applied to mvebu/soc > > ... > > However, this one should go through Russell's git tree. Or at least > you need his acked-by. I have already submit this patch on Russell > patch system. Unfortunately Russell told that he will be away for > around one week. > > This patch is needed to have LPAE support, but all the other patches > don't depend on it. That means that if you applied all the other > patches it won't break anything even if at the end this patch is not > merged. But I really hope that Russell will be able to apply this > patch to his git tree. ok, thanks for catching this before I sent the PR. I'll drop it. thx, Jason.
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index f584d3f..d75dc67 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -402,6 +402,8 @@ __v7_ca9mp_proc_info: __v7_proc __v7_ca9mp_setup .size __v7_ca9mp_proc_info, . - __v7_ca9mp_proc_info +#endif /* CONFIG_ARM_LPAE */ + /* * Marvell PJ4B processor. */ @@ -411,7 +413,6 @@ __v7_pj4b_proc_info: .long 0xfffffff0 __v7_proc __v7_pj4b_setup .size __v7_pj4b_proc_info, . - __v7_pj4b_proc_info -#endif /* CONFIG_ARM_LPAE */ /* * ARM Ltd. Cortex A7 processor.