Fix section conflict of ia64_mlogbuf_finish

Fix section conflict of ia64_mlogbuf_finish

[Martin Michlmayr]

Building with GCC 4.2, I get the following error:

  CC      arch/ia64/kernel/mca.o
arch/ia64/kernel/mca.c:275: error: __ksymtab_ia64_mlogbuf_finish causes a section type conflict

This is because ia64_mlogbuf_finish is both declared static and exported.

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>

--- a/arch/ia64/kernel/mca.c~	2007-05-15 16:15:50.000000000 +0000
+++ b/arch/ia64/kernel/mca.c	2007-05-15 16:27:46.985701032 +0000
@@ -254,7 +254,7 @@
  * invoked, long-wait rendezvous etc.)
  *  NOTE: this should be called from monarch.
  */
-static void ia64_mlogbuf_finish(int wait)
+void ia64_mlogbuf_finish(int wait)
 {
 	BREAK_LOGLEVEL(console_loglevel);
 

-- 
Martin Michlmayr
http://www.cyrius.com/

RE: Fix section conflict of ia64_mlogbuf_finish

[Luck, Tony]

>  CC      arch/ia64/kernel/mca.o
> arch/ia64/kernel/mca.c:275: error: __ksymtab_ia64_mlogbuf_finish causes a section type conflict
>
> This is because ia64_mlogbuf_finish is both declared static and exported.

Why is it exported?  mca_drv.c (our only mca related module) doesn't
use it.  Perhaps the fix should be to drop the EXPORT?

-Tony

Re: Fix section conflict of ia64_mlogbuf_finish

[Russ Anderson]

Tony Luck wrote:
>
> >  CC      arch/ia64/kernel/mca.o
> > arch/ia64/kernel/mca.c:275: error: __ksymtab_ia64_mlogbuf_finish causes a section type conflict
> >
> > This is because ia64_mlogbuf_finish is both declared static and exported.
> 
> Why is it exported?  mca_drv.c (our only mca related module) doesn't
> use it.  Perhaps the fix should be to drop the EXPORT?

I suspect EXPORT is left over from the initial development/debug.
Either change is fine with me.

-- 
Russ Anderson, OS RAS/Partitioning Project Lead  
SGI - Silicon Graphics Inc          rja@sgi.com

Re: Fix section conflict of ia64_mlogbuf_finish

[Martin Michlmayr]

* Russ Anderson <rja@sgi.com> [2007-05-15 13:32]:
> I suspect EXPORT is left over from the initial development/debug.
> Either change is fine with me.

OK, then let's use this one instead:


Subject: Fix section conflict of ia64_mlogbuf_finish

Building with GCC 4.2, I get the following error:

  CC      arch/ia64/kernel/mca.o
arch/ia64/kernel/mca.c:275: error: __ksymtab_ia64_mlogbuf_finish causes a
section type conflict

This is because ia64_mlogbuf_finish is both declared static and exported.

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>

--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -272,7 +272,6 @@ static void ia64_mlogbuf_finish(int wait)
 
 	mlogbuf_finished = 1;
 }
-EXPORT_SYMBOL(ia64_mlogbuf_finish);
 
 /*
  * Print buffered messages from INIT context.

-- 
Martin Michlmayr
http://www.cyrius.com/

Re: Fix section conflict of ia64_mlogbuf_finish

[Hidetoshi Seto]

 >> I suspect EXPORT is left over from the initial development/debug.

Yes, that's right.

The reason why the EXPORT was there is that I supposed a optional use
of ia64_mlogbuf_finish expecting that there would be some non-standard
mca recovery module, module relating kdump or something.
However such module is not there at the moment.

Thanks,
H.Seto

Martin Michlmayr wrote:
> * Russ Anderson <rja@sgi.com> [2007-05-15 13:32]:
>> I suspect EXPORT is left over from the initial development/debug.
>> Either change is fine with me.
> 
> OK, then let's use this one instead:
> 
> 
> Subject: Fix section conflict of ia64_mlogbuf_finish
> 
> Building with GCC 4.2, I get the following error:
> 
>   CC      arch/ia64/kernel/mca.o
> arch/ia64/kernel/mca.c:275: error: __ksymtab_ia64_mlogbuf_finish causes a
> section type conflict
> 
> This is because ia64_mlogbuf_finish is both declared static and exported.
> 
> Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
> 
> --- a/arch/ia64/kernel/mca.c
> +++ b/arch/ia64/kernel/mca.c
> @@ -272,7 +272,6 @@ static void ia64_mlogbuf_finish(int wait)
>  
>  	mlogbuf_finished = 1;
>  }
> -EXPORT_SYMBOL(ia64_mlogbuf_finish);
>  
>  /*
>   * Print buffered messages from INIT context.
>