[2.6 patch] arch/parisc/mm/init.c: fix SMP=y compilation

[2.6 patch] arch/parisc/mm/init.c: fix SMP=y compilation

[Adrian Bunk]

This patch fixes the following compile error with CONFIG_SMP=y:

<--  snip  -->

...
  CC      arch/parisc/mm/init.o
arch/parisc/mm/init.c:795: error: conflicting types for 'flush_tlb_all_local'
include/asm/tlbflush.h:25: error: previous declaration of 'flush_tlb_all_local' was here
arch/parisc/mm/init.c: In function 'flush_tlb_all':
arch/parisc/mm/init.c:1008: error: too many arguments to function 'flush_tlb_all_local'
make[1]: *** [arch/parisc/mm/init.o] Error 1

<--  snip  -->


Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

 arch/parisc/mm/init.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--- linux-2.6.15-mm3-hppa/arch/parisc/mm/init.c.old	2006-01-12 10:06:01.000000000 +0100
+++ linux-2.6.15-mm3-hppa/arch/parisc/mm/init.c	2006-01-12 10:07:32.000000000 +0100
@@ -792,8 +792,6 @@ map_hpux_gateway_page(struct task_struct
 EXPORT_SYMBOL(map_hpux_gateway_page);
 #endif
 
-extern void flush_tlb_all_local(void);
-
 void __init paging_init(void)
 {
 	int i;
@@ -802,7 +800,7 @@ void __init paging_init(void)
 	pagetable_init();
 	gateway_init();
 	flush_cache_all_local(); /* start with known state */
-	flush_tlb_all_local();
+	flush_tlb_all_local(NULL);
 
 	for (i = 0; i < npmem_ranges; i++) {
 		unsigned long zones_size[MAX_NR_ZONES] = { 0, 0, 0 };
@@ -993,7 +991,7 @@ void flush_tlb_all(void)
 	    do_recycle++;
 	}
 	spin_unlock(&sid_lock);
-	on_each_cpu((void (*)(void *))flush_tlb_all_local, NULL, 1, 1);
+	on_each_cpu(flush_tlb_all_local, NULL, 1, 1);
 	if (do_recycle) {
 	    spin_lock(&sid_lock);
 	    recycle_sids(recycle_ndirty,recycle_dirty_array);

Re: [2.6 patch] arch/parisc/mm/init.c: fix SMP=y compilation

[Matthew Wilcox]

On Thu, Jan 12, 2006 at 10:20:17AM +0100, Adrian Bunk wrote:
> This patch fixes the following compile error with CONFIG_SMP=y:
> @@ -802,7 +800,7 @@ void __init paging_init(void)
>  	pagetable_init();
>  	gateway_init();
>  	flush_cache_all_local(); /* start with known state */
> -	flush_tlb_all_local();
> +	flush_tlb_all_local(NULL);
>  

It's already this way in the parisc tree.  Kyle, did you miss part of
the merge?

Re: [parisc-linux] Re: [2.6 patch] arch/parisc/mm/init.c: fix SMP=y compilation

[Kyle McMartin]

On Thu, Jan 12, 2006 at 05:50:20AM -0700, Matthew Wilcox wrote:
> It's already this way in the parisc tree.  Kyle, did you miss part of
> the merge?

Indeed. I handcrafted most of the patches I applied, and it seems I forgot
to look for duplicates (patching the same file twice in the same diff)
so while one part of mm/init.c got fribbled, the other didn't. Fix
applied to my tree.

Thanks for pointing this out,
	Kyle