diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2008-03-08 04:56:28 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2008-03-12 10:14:41 -0400 |
commit | 234fcd1484a66158b561b36b421547f0ab85fee9 (patch) | |
tree | b63fbb134fd673e1713f0462e6e0642b418da616 /arch/mips/sgi-ip27 | |
parent | 1af0eea21431bed5d07dffc0fefab57fd72f7e90 (diff) |
[MIPS] Fix loads of section missmatches
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/sgi-ip27')
-rw-r--r-- | arch/mips/sgi-ip27/ip27-init.c | 2 | ||||
-rw-r--r-- | arch/mips/sgi-ip27/ip27-timer.c | 2 | ||||
-rw-r--r-- | arch/mips/sgi-ip27/ip27-xtalk.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips/sgi-ip27/ip27-init.c b/arch/mips/sgi-ip27/ip27-init.c index a49e7c85f724..7093e7c573a4 100644 --- a/arch/mips/sgi-ip27/ip27-init.c +++ b/arch/mips/sgi-ip27/ip27-init.c | |||
@@ -53,7 +53,7 @@ extern void pcibr_setup(cnodeid_t); | |||
53 | 53 | ||
54 | extern void xtalk_probe_node(cnodeid_t nid); | 54 | extern void xtalk_probe_node(cnodeid_t nid); |
55 | 55 | ||
56 | static void __init per_hub_init(cnodeid_t cnode) | 56 | static void __cpuinit per_hub_init(cnodeid_t cnode) |
57 | { | 57 | { |
58 | struct hub_data *hub = hub_data(cnode); | 58 | struct hub_data *hub = hub_data(cnode); |
59 | nasid_t nasid = COMPACT_TO_NASID_NODEID(cnode); | 59 | nasid_t nasid = COMPACT_TO_NASID_NODEID(cnode); |
diff --git a/arch/mips/sgi-ip27/ip27-timer.c b/arch/mips/sgi-ip27/ip27-timer.c index 08d45369be45..25d3baf0ebc4 100644 --- a/arch/mips/sgi-ip27/ip27-timer.c +++ b/arch/mips/sgi-ip27/ip27-timer.c | |||
@@ -285,7 +285,7 @@ void __cpuinit cpu_time_init(void) | |||
285 | set_c0_status(SRB_TIMOCLK); | 285 | set_c0_status(SRB_TIMOCLK); |
286 | } | 286 | } |
287 | 287 | ||
288 | void __init hub_rtc_init(cnodeid_t cnode) | 288 | void __cpuinit hub_rtc_init(cnodeid_t cnode) |
289 | { | 289 | { |
290 | /* | 290 | /* |
291 | * We only need to initialize the current node. | 291 | * We only need to initialize the current node. |
diff --git a/arch/mips/sgi-ip27/ip27-xtalk.c b/arch/mips/sgi-ip27/ip27-xtalk.c index fc82f34a32ce..6ae64e8dfc40 100644 --- a/arch/mips/sgi-ip27/ip27-xtalk.c +++ b/arch/mips/sgi-ip27/ip27-xtalk.c | |||
@@ -22,7 +22,7 @@ | |||
22 | 22 | ||
23 | extern int bridge_probe(nasid_t nasid, int widget, int masterwid); | 23 | extern int bridge_probe(nasid_t nasid, int widget, int masterwid); |
24 | 24 | ||
25 | static int __init probe_one_port(nasid_t nasid, int widget, int masterwid) | 25 | static int __cpuinit probe_one_port(nasid_t nasid, int widget, int masterwid) |
26 | { | 26 | { |
27 | widgetreg_t widget_id; | 27 | widgetreg_t widget_id; |
28 | xwidget_part_num_t partnum; | 28 | xwidget_part_num_t partnum; |
@@ -46,7 +46,7 @@ static int __init probe_one_port(nasid_t nasid, int widget, int masterwid) | |||
46 | return 0; | 46 | return 0; |
47 | } | 47 | } |
48 | 48 | ||
49 | static int __init xbow_probe(nasid_t nasid) | 49 | static int __cpuinit xbow_probe(nasid_t nasid) |
50 | { | 50 | { |
51 | lboard_t *brd; | 51 | lboard_t *brd; |
52 | klxbow_t *xbow_p; | 52 | klxbow_t *xbow_p; |
@@ -99,7 +99,7 @@ static int __init xbow_probe(nasid_t nasid) | |||
99 | return 0; | 99 | return 0; |
100 | } | 100 | } |
101 | 101 | ||
102 | void __init xtalk_probe_node(cnodeid_t nid) | 102 | void __cpuinit xtalk_probe_node(cnodeid_t nid) |
103 | { | 103 | { |
104 | volatile u64 hubreg; | 104 | volatile u64 hubreg; |
105 | nasid_t nasid; | 105 | nasid_t nasid; |