lkml.org 
[lkml]   [2006]   [Jan]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[2.6 patch] arch/parisc/mm/init.c: fix SMP=y compilation
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);
-
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/

\
 
 \ /
  Last update: 2006-01-12 10:22    [W:0.054 / U:0.156 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site