* [PATCH] Fix some section mismatches
@ 2008-04-14 12:52 Atsushi Nemoto
2008-04-14 13:10 ` Ralf Baechle
0 siblings, 1 reply; 2+ messages in thread
From: Atsushi Nemoto @ 2008-04-14 12:52 UTC (permalink / raw
To: linux-mips; +Cc: ralf
Also make coherentio static.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
---
Patch against linux-queue tree.
arch/mips/kernel/spram.c | 14 +++++++-------
arch/mips/mm/c-r4k.c | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/mips/kernel/spram.c b/arch/mips/kernel/spram.c
index 31bb952..6ddb507 100644
--- a/arch/mips/kernel/spram.c
+++ b/arch/mips/kernel/spram.c
@@ -39,7 +39,7 @@
/*
* Different semantics to the set_c0_* function built by __BUILD_SET_C0
*/
-static __init unsigned int bis_c0_errctl(unsigned int set)
+static __cpuinit unsigned int bis_c0_errctl(unsigned int set)
{
unsigned int res;
res = read_c0_errctl();
@@ -47,7 +47,7 @@ static __init unsigned int bis_c0_errctl(unsigned int set)
return res;
}
-static __init void ispram_store_tag(unsigned int offset, unsigned int data)
+static __cpuinit void ispram_store_tag(unsigned int offset, unsigned int data)
{
unsigned int errctl;
@@ -66,7 +66,7 @@ static __init void ispram_store_tag(unsigned int offset, unsigned int data)
}
-static __init unsigned int ispram_load_tag(unsigned int offset)
+static __cpuinit unsigned int ispram_load_tag(unsigned int offset)
{
unsigned int data;
unsigned int errctl;
@@ -84,7 +84,7 @@ static __init unsigned int ispram_load_tag(unsigned int offset)
return data;
}
-static __init void dspram_store_tag(unsigned int offset, unsigned int data)
+static __cpuinit void dspram_store_tag(unsigned int offset, unsigned int data)
{
unsigned int errctl;
@@ -100,7 +100,7 @@ static __init void dspram_store_tag(unsigned int offset, unsigned int data)
}
-static __init unsigned int dspram_load_tag(unsigned int offset)
+static __cpuinit unsigned int dspram_load_tag(unsigned int offset)
{
unsigned int data;
unsigned int errctl;
@@ -117,7 +117,7 @@ static __init unsigned int dspram_load_tag(unsigned int offset)
return data;
}
-static __init void probe_spram(char *type,
+static __cpuinit void probe_spram(char *type,
unsigned int base,
unsigned int (*read)(unsigned int),
void (*write)(unsigned int, unsigned int))
@@ -199,7 +199,7 @@ static __init void probe_spram(char *type,
}
}
-__init void spram_config(void)
+__cpuinit void spram_config(void)
{
struct cpuinfo_mips *c = ¤t_cpu_data;
unsigned int config0;
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index 92b549e..82bdc66 100644
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -1226,7 +1226,7 @@ void au1x00_fixup_config_od(void)
}
}
-static int __initdata cca = -1;
+static int __cpuinitdata cca = -1;
unsigned long _page_cachable_default;
EXPORT_SYMBOL_GPL(_page_cachable_default);
@@ -1296,7 +1296,7 @@ static void __cpuinit coherency_setup(void)
#if defined(CONFIG_DMA_NONCOHERENT)
-int __initdata coherentio;
+static int __cpuinitdata coherentio;
static int __init setcoherentio(char *str)
{
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Fix some section mismatches
2008-04-14 12:52 [PATCH] Fix some section mismatches Atsushi Nemoto
@ 2008-04-14 13:10 ` Ralf Baechle
0 siblings, 0 replies; 2+ messages in thread
From: Ralf Baechle @ 2008-04-14 13:10 UTC (permalink / raw
To: Atsushi Nemoto; +Cc: linux-mips
On Mon, Apr 14, 2008 at 09:52:51PM +0900, Atsushi Nemoto wrote:
> Also make coherentio static.
>
> Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Thanks; I folded your fixes into the other queue patches which introduced
the bugs.
Ralf
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-04-14 13:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-14 12:52 [PATCH] Fix some section mismatches Atsushi Nemoto
2008-04-14 13:10 ` Ralf Baechle
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.