All of lore.kernel.org
 help / color / mirror / Atom feed
From: Adrian Bunk <bunk@stusta.de>
To: Matthew Wilcox <willy@parisc-linux.org>
Cc: Kyle McMartin <kyle@parisc-linux.org>,
	grundler@parisc-linux.org, parisc-linux@parisc-linux.org,
	linux-kernel@vger.kernel.org
Subject: [2.6 patch] arch/parisc/mm/init.c: fix SMP=y compilation
Date: Thu, 12 Jan 2006 10:20:17 +0100	[thread overview]
Message-ID: <20060112092017.GP29663@stusta.de> (raw)

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);


             reply	other threads:[~2006-01-12  9:20 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-01-12  9:20 Adrian Bunk [this message]
2006-01-12 12:50 ` [2.6 patch] arch/parisc/mm/init.c: fix SMP=y compilation Matthew Wilcox
2006-01-12 14:28   ` [parisc-linux] " Kyle McMartin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060112092017.GP29663@stusta.de \
    --to=bunk@stusta.de \
    --cc=grundler@parisc-linux.org \
    --cc=kyle@parisc-linux.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=parisc-linux@parisc-linux.org \
    --cc=willy@parisc-linux.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.