[MIPS] Fix section mismatches when compiling atlas and decstation defconfigs

[MIPS] Fix section mismatches when compiling atlas and decstation defconfigs

[Shane McDonald]

From: Shane McDonald <mcdonald.shane@gmail.com>

Section mismatches are reported when compiling the default
Atlas configuration and the default Decstation configuration.
This patch resolves those mismatches by defining affected
functions with the __cpuinit attribute, rather than __init.

Signed-off-by: Shane McDonald <mcdonald.shane@gmail.com>
---
 arch/mips/mm/c-r3k.c   |    6 +++---
 arch/mips/mm/sc-rm7k.c |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff -uprN -X orig/Documentation/dontdiff orig/arch/mips/mm/c-r3k.c patched/arch/mips/mm/c-r3k.c
--- orig/arch/mips/mm/c-r3k.c	2008-07-04 17:22:25.000000000 -0600
+++ patched/arch/mips/mm/c-r3k.c	2008-07-05 11:56:01.000000000 -0600
@@ -26,7 +26,7 @@
 static unsigned long icache_size, dcache_size;		/* Size in bytes */
 static unsigned long icache_lsize, dcache_lsize;	/* Size in bytes */
 
-unsigned long __init r3k_cache_size(unsigned long ca_flags)
+unsigned long __cpuinit r3k_cache_size(unsigned long ca_flags)
 {
 	unsigned long flags, status, dummy, size;
 	volatile unsigned long *p;
@@ -61,7 +61,7 @@ unsigned long __init r3k_cache_size(unsi
 	return size * sizeof(*p);
 }
 
-unsigned long __init r3k_cache_lsize(unsigned long ca_flags)
+unsigned long __cpuinit r3k_cache_lsize(unsigned long ca_flags)
 {
 	unsigned long flags, status, lsize, i;
 	volatile unsigned long *p;
@@ -90,7 +90,7 @@ unsigned long __init r3k_cache_lsize(uns
 	return lsize * sizeof(*p);
 }
 
-static void __init r3k_probe_cache(void)
+static void __cpuinit r3k_probe_cache(void)
 {
 	dcache_size = r3k_cache_size(ST0_ISC);
 	if (dcache_size)
diff -uprN -X orig/Documentation/dontdiff orig/arch/mips/mm/sc-rm7k.c patched/arch/mips/mm/sc-rm7k.c
--- orig/arch/mips/mm/sc-rm7k.c	2008-07-04 17:22:25.000000000 -0600
+++ patched/arch/mips/mm/sc-rm7k.c	2008-07-05 09:51:34.000000000 -0600
@@ -86,7 +86,7 @@ static void rm7k_sc_inv(unsigned long ad
 /*
  * This function is executed in uncached address space.
  */
-static __init void __rm7k_sc_enable(void)
+static __cpuinit void __rm7k_sc_enable(void)
 {
 	int i;
 
@@ -107,7 +107,7 @@ static __init void __rm7k_sc_enable(void
 	}
 }
 
-static __init void rm7k_sc_enable(void)
+static __cpuinit void rm7k_sc_enable(void)
 {
 	if (read_c0_config() & RM7K_CONF_SE)
 		return;

Re: [MIPS] Fix section mismatches when compiling atlas and decstation defconfigs

[Ralf Baechle]

On Sat, Jul 05, 2008 at 05:19:42PM -0600, Shane McDonald wrote:

> From: Shane McDonald <mcdonald.shane@gmail.com>

Btw, while it doesn't harm there is no need to insert this From: line into
the patch if it's identical to the sender's email address as in your case.
Where it's missing git will just pick the From: address from the email
headers.

> Section mismatches are reported when compiling the default
> Atlas configuration and the default Decstation configuration.
> This patch resolves those mismatches by defining affected
> functions with the __cpuinit attribute, rather than __init.
> 
> Signed-off-by: Shane McDonald <mcdonald.shane@gmail.com>

Thanks, applied.

  Ralf

Re: [MIPS] Fix section mismatches when compiling atlas and decstation defconfigs

[Ralf Baechle]

On Sat, Jul 05, 2008 at 05:19:42PM -0600, Shane McDonald wrote:

> From: Shane McDonald <mcdonald.shane@gmail.com>
> 
> Section mismatches are reported when compiling the default
> Atlas configuration and the default Decstation configuration.
> This patch resolves those mismatches by defining affected
> functions with the __cpuinit attribute, rather than __init.
> 
> Signed-off-by: Shane McDonald <mcdonald.shane@gmail.com>

I already had an earlier version of your patch applied so I have only
applied the c-r4k.c part now with an adjusted comment.

Thanks,

  Ralf

Re: [MIPS] Fix section mismatches when compiling atlas and decstation defconfigs

[Dmitri Vorobiev]

Ralf Baechle wrote:
> On Sat, Jul 05, 2008 at 05:19:42PM -0600, Shane McDonald wrote:
> 
>> From: Shane McDonald <mcdonald.shane@gmail.com>
>>
>> Section mismatches are reported when compiling the default
>> Atlas configuration and the default Decstation configuration.
>> This patch resolves those mismatches by defining affected
>> functions with the __cpuinit attribute, rather than __init.
>>
>> Signed-off-by: Shane McDonald <mcdonald.shane@gmail.com>
> 
> I already had an earlier version of your patch applied so I have only
> applied the c-r4k.c part now with an adjusted comment.

Isn't Atlas doomed to death?

Thanks,
Dmitri

> 
> Thanks,
> 
>   Ralf
> 

Re: [MIPS] Fix section mismatches when compiling atlas and decstation defconfigs

[Ralf Baechle]

On Wed, Jul 09, 2008 at 10:29:38AM +0300, Dmitri Vorobiev wrote:

> Ralf Baechle wrote:
> > On Sat, Jul 05, 2008 at 05:19:42PM -0600, Shane McDonald wrote:
> > 
> >> From: Shane McDonald <mcdonald.shane@gmail.com>
> >>
> >> Section mismatches are reported when compiling the default
> >> Atlas configuration and the default Decstation configuration.
> >> This patch resolves those mismatches by defining affected
> >> functions with the __cpuinit attribute, rather than __init.
> >>
> >> Signed-off-by: Shane McDonald <mcdonald.shane@gmail.com>
> > 
> > I already had an earlier version of your patch applied so I have only
> > applied the c-r4k.c part now with an adjusted comment.
> 
> Isn't Atlas doomed to death?

Yes - but there is nothing in this patch that actually makes it Atlas or
DECstation specific.  It's simply fixing bugs in the CPU cache code.

  Ralf