Patchwork powerpc: Fix missing semicolons in mmu_decl.h

login
register
mail settings
Submitter Benjamin Herrenschmidt
Date Jan. 7, 2009, 3:56 a.m.
Message ID <20090107035702.C9114474D7@ozlabs.org>
Download mbox | patch
Permalink /patch/17037/
State Accepted
Commit 4a0826824beb28390651a962987b0681b9e7fe93
Headers show

Comments

Benjamin Herrenschmidt - Jan. 7, 2009, 3:56 a.m.
This is a brown paper bag from one of my earlier patches that
breaks build on 40x and 8xx.

And yes, I've now added 40x and 8xx to my list of test configs :-)

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---

 arch/powerpc/mm/mmu_decl.h |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Josh Boyer - Jan. 7, 2009, 2:37 p.m.
On Wed, Jan 07, 2009 at 02:56:51PM +1100, Benjamin Herrenschmidt wrote:
>This is a brown paper bag from one of my earlier patches that
>breaks build on 40x and 8xx.
>
>And yes, I've now added 40x and 8xx to my list of test configs :-)
>
>Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

Acked-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>

Please get it into your tree so people stop emailing me about it
being broken :).

josh

>---
>
> arch/powerpc/mm/mmu_decl.h |    6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>--- linux-work.orig/arch/powerpc/mm/mmu_decl.h	2009-01-07 14:52:33.000000000 +1100
>+++ linux-work/arch/powerpc/mm/mmu_decl.h	2009-01-07 14:52:43.000000000 +1100
>@@ -30,11 +30,11 @@
> #if defined(CONFIG_40x) || defined(CONFIG_8xx)
> static inline void _tlbil_all(void)
> {
>-	asm volatile ("sync; tlbia; isync" : : : "memory")
>+	asm volatile ("sync; tlbia; isync" : : : "memory");
> }
> static inline void _tlbil_pid(unsigned int pid)
> {
>-	asm volatile ("sync; tlbia; isync" : : : "memory")
>+	asm volatile ("sync; tlbia; isync" : : : "memory");
> }
> #else /* CONFIG_40x || CONFIG_8xx */
> extern void _tlbil_all(void);
>@@ -47,7 +47,7 @@ extern void _tlbil_pid(unsigned int pid)
> #ifdef CONFIG_8xx
> static inline void _tlbil_va(unsigned long address, unsigned int pid)
> {
>-	asm volatile ("tlbie %0; sync" : : "r" (address) : "memory")
>+	asm volatile ("tlbie %0; sync" : : "r" (address) : "memory");
> }
> #else /* CONFIG_8xx */
> extern void _tlbil_va(unsigned long address, unsigned int pid);
>_______________________________________________
>Linuxppc-dev mailing list
>Linuxppc-dev@ozlabs.org
>https://ozlabs.org/mailman/listinfo/linuxppc-dev
Benjamin Herrenschmidt - Jan. 7, 2009, 8:51 p.m.
On Wed, 2009-01-07 at 09:37 -0500, Josh Boyer wrote:
> On Wed, Jan 07, 2009 at 02:56:51PM +1100, Benjamin Herrenschmidt wrote:
> >This is a brown paper bag from one of my earlier patches that
> >breaks build on 40x and 8xx.
> >
> >And yes, I've now added 40x and 8xx to my list of test configs :-)
> >
> >Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> 
> Acked-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
> 
> Please get it into your tree so people stop emailing me about it
> being broken :).

It's in, waiting for me to push. I didn't have a chance yesterday due to
other problems but hopefully, after I do a few boot tests today, I'll
push out.

Ben.

Patch

--- linux-work.orig/arch/powerpc/mm/mmu_decl.h	2009-01-07 14:52:33.000000000 +1100
+++ linux-work/arch/powerpc/mm/mmu_decl.h	2009-01-07 14:52:43.000000000 +1100
@@ -30,11 +30,11 @@ 
 #if defined(CONFIG_40x) || defined(CONFIG_8xx)
 static inline void _tlbil_all(void)
 {
-	asm volatile ("sync; tlbia; isync" : : : "memory")
+	asm volatile ("sync; tlbia; isync" : : : "memory");
 }
 static inline void _tlbil_pid(unsigned int pid)
 {
-	asm volatile ("sync; tlbia; isync" : : : "memory")
+	asm volatile ("sync; tlbia; isync" : : : "memory");
 }
 #else /* CONFIG_40x || CONFIG_8xx */
 extern void _tlbil_all(void);
@@ -47,7 +47,7 @@  extern void _tlbil_pid(unsigned int pid)
 #ifdef CONFIG_8xx
 static inline void _tlbil_va(unsigned long address, unsigned int pid)
 {
-	asm volatile ("tlbie %0; sync" : : "r" (address) : "memory")
+	asm volatile ("tlbie %0; sync" : : "r" (address) : "memory");
 }
 #else /* CONFIG_8xx */
 extern void _tlbil_va(unsigned long address, unsigned int pid);