Skip to contentSkip to conversation

powerpc: fix compile damage from 2a4aca11

PATCH Benjamin Herrenschmidt 2 participants 2 messages Dec 29, 2008 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Quoted 10 lines · Rusty Russell

In file included from /scratch/kisskb/src/arch/powerpc/mm/mem.c:51:
/scratch/kisskb/src/arch/powerpc/mm/mmu_decl.h: In function '_tlbil_all':
/scratch/kisskb/src/arch/powerpc/mm/mmu_decl.h:34: error: expected ';' before '}' token /scratch/kisskb/src/arch/powerpc/mm/mmu_decl.h:36: error: invalid storage class for function '_tlbil_pid'

"powerpc/mm: Split low level tlb invalidate for nohash processors" needs more semicolons. Or testing. Or both.

Yeah, looks like both paulus and I are missing 40x and 8xx test configs in our build tests :-( I'll fix that.,

Quoted 1 line

Nice signed-off :-)

Cheers,
Ben.

Quoted 27 lines
arch/powerpc/mm/mmu_decl.h +3 -3
index 4314b39..ad123bc 100644
@@ -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);
#2 lore raw
Quoted 9 lines · Benjamin Herrenschmidt
Quoted 8 lines · Rusty Russell

In file included from /scratch/kisskb/src/arch/powerpc/mm/mem.c:51:
/scratch/kisskb/src/arch/powerpc/mm/mmu_decl.h: In function '_tlbil_all':
/scratch/kisskb/src/arch/powerpc/mm/mmu_decl.h:34: error: expected ';' before '}' token /scratch/kisskb/src/arch/powerpc/mm/mmu_decl.h:36: error: invalid storage class for function '_tlbil_pid'

Quoted 5 lines
Quoted 2 lines

"powerpc/mm: Split low level tlb invalidate for nohash processors" needs more semicolons. Or testing. Or both.

Yeah, looks like both paulus and I are missing 40x and 8xx test configs in our build tests :-( I'll fix that.,

Argh. I have that fixed locally because I needed it during my testing. Seems I never actually reported the problem. Sorry. I blame testing new patches the day before vacation starts.

josh