| Message ID | 1410759015-15642-1-git-send-email-behanw@converseincode.com |
|---|---|
| State | Accepted |
| Commit | fe184066abda9de114a80db24f1496ee6c31d1af |
| Headers | show |
On Mon, Sep 15, 2014 at 06:30:15AM +0100, behanw@converseincode.com wrote: > From: Mark Charlebois <charlebm@gmail.com> > > Remove '#' from immediate parameter in AARCH64 inline assembly in mmu. > > This code now works with both gcc and clang. > > Signed-off-by: Mark Charlebois <charlebm@gmail.com> > Signed-off-by: Behan Webster <behanw@converseincode.com> > --- > arch/arm64/mm/mmu.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Acked-by: Will Deacon <will.deacon@arm.com> Thanks, Behan! Catalin: please can you pick this up for 3.18? It's probably not worth me merging it as a fix, since there are other patches needed to get us building under clang anyway. Will > diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c > index c555672..6894ef3 100644 > --- a/arch/arm64/mm/mmu.c > +++ b/arch/arm64/mm/mmu.c > @@ -94,7 +94,7 @@ static int __init early_cachepolicy(char *p) > */ > asm volatile( > " mrs %0, mair_el1\n" > - " bfi %0, %1, #%2, #8\n" > + " bfi %0, %1, %2, #8\n" > " msr mair_el1, %0\n" > " isb\n" > : "=&r" (tmp) > -- > 1.9.1 > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
On Mon, Sep 15, 2014 at 05:02:41PM +0100, Will Deacon wrote: > On Mon, Sep 15, 2014 at 06:30:15AM +0100, behanw@converseincode.com wrote: > > From: Mark Charlebois <charlebm@gmail.com> > > > > Remove '#' from immediate parameter in AARCH64 inline assembly in mmu. > > > > This code now works with both gcc and clang. > > > > Signed-off-by: Mark Charlebois <charlebm@gmail.com> > > Signed-off-by: Behan Webster <behanw@converseincode.com> > > --- > > arch/arm64/mm/mmu.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > Acked-by: Will Deacon <will.deacon@arm.com> > > Thanks, Behan! > > Catalin: please can you pick this up for 3.18? It's probably not worth me > merging it as a fix, since there are other patches needed to get us building > under clang anyway. I agree, it will go in for 3.18 rather than 3.17.
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index c555672..6894ef3 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -94,7 +94,7 @@ static int __init early_cachepolicy(char *p) */ asm volatile( " mrs %0, mair_el1\n" - " bfi %0, %1, #%2, #8\n" + " bfi %0, %1, %2, #8\n" " msr mair_el1, %0\n" " isb\n" : "=&r" (tmp)