aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/m68k/apollo/config.c4
-rw-r--r--arch/m68k/apollo/dn_ints.c2
-rw-r--r--arch/m68k/bvme6000/config.c2
-rw-r--r--arch/m68k/kernel/time.c2
-rw-r--r--arch/m68k/mac/config.c6
-rw-r--r--arch/m68k/mac/macints.c4
-rw-r--r--arch/m68k/mm/init.c2
-rw-r--r--arch/m68k/mvme147/config.c2
-rw-r--r--arch/m68k/mvme16x/config.c2
-rw-r--r--arch/m68k/q40/q40ints.c2
-rw-r--r--arch/m68k/sun3/sun3ints.c2
-rw-r--r--arch/m68k/sun3x/prom.c2
12 files changed, 17 insertions, 15 deletions
diff --git a/arch/m68k/apollo/config.c b/arch/m68k/apollo/config.c
index cb8e7609df4..78df98f2029 100644
--- a/arch/m68k/apollo/config.c
+++ b/arch/m68k/apollo/config.c
@@ -148,8 +148,8 @@ void dn_serial_print (const char *str)
148 } 148 }
149} 149}
150 150
151void config_apollo(void) { 151void __init config_apollo(void)
152 152{
153 int i; 153 int i;
154 154
155 dn_setup_model(); 155 dn_setup_model();
diff --git a/arch/m68k/apollo/dn_ints.c b/arch/m68k/apollo/dn_ints.c
index 13bd41bed28..5d47f3aa381 100644
--- a/arch/m68k/apollo/dn_ints.c
+++ b/arch/m68k/apollo/dn_ints.c
@@ -37,7 +37,7 @@ static struct irq_controller apollo_irq_controller = {
37}; 37};
38 38
39 39
40void dn_init_IRQ(void) 40void __init dn_init_IRQ(void)
41{ 41{
42 m68k_setup_user_interrupt(VEC_USER + 96, 16, dn_process_int); 42 m68k_setup_user_interrupt(VEC_USER + 96, 16, dn_process_int);
43 m68k_setup_irq_controller(&apollo_irq_controller, IRQ_APOLLO, 16); 43 m68k_setup_irq_controller(&apollo_irq_controller, IRQ_APOLLO, 16);
diff --git a/arch/m68k/bvme6000/config.c b/arch/m68k/bvme6000/config.c
index 896ae3d3d91..9433a88a33c 100644
--- a/arch/m68k/bvme6000/config.c
+++ b/arch/m68k/bvme6000/config.c
@@ -97,7 +97,7 @@ static int bvme6000_get_hardware_list(char *buffer)
97 * This function is called during kernel startup to initialize 97 * This function is called during kernel startup to initialize
98 * the bvme6000 IRQ handling routines. 98 * the bvme6000 IRQ handling routines.
99 */ 99 */
100static void bvme6000_init_IRQ(void) 100static void __init bvme6000_init_IRQ(void)
101{ 101{
102 m68k_setup_user_interrupt(VEC_USER, 192, NULL); 102 m68k_setup_user_interrupt(VEC_USER, 192, NULL);
103} 103}
diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c
index 4c065f9ceff..7db41594d7b 100644
--- a/arch/m68k/kernel/time.c
+++ b/arch/m68k/kernel/time.c
@@ -72,7 +72,7 @@ static irqreturn_t timer_interrupt(int irq, void *dummy)
72 return IRQ_HANDLED; 72 return IRQ_HANDLED;
73} 73}
74 74
75void time_init(void) 75void __init time_init(void)
76{ 76{
77 struct rtc_time time; 77 struct rtc_time time;
78 78
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index 9a7f14eb9df..8547dbc5e8d 100644
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@ -85,7 +85,7 @@ extern void nubus_sweep_video(void);
85 85
86static void mac_get_model(char *str); 86static void mac_get_model(char *str);
87 87
88static void mac_sched_init(irq_handler_t vector) 88static void __init mac_sched_init(irq_handler_t vector)
89{ 89{
90 via_init_clock(vector); 90 via_init_clock(vector);
91} 91}
@@ -770,7 +770,7 @@ static struct mac_model mac_data_table[] = {
770 } 770 }
771}; 771};
772 772
773void mac_identify(void) 773void __init mac_identify(void)
774{ 774{
775 struct mac_model *m; 775 struct mac_model *m;
776 776
@@ -847,7 +847,7 @@ void mac_identify(void)
847 baboon_init(); 847 baboon_init();
848} 848}
849 849
850void mac_report_hardware(void) 850void __init mac_report_hardware(void)
851{ 851{
852 printk(KERN_INFO "Apple Macintosh %s\n", macintosh_config->name); 852 printk(KERN_INFO "Apple Macintosh %s\n", macintosh_config->name);
853} 853}
diff --git a/arch/m68k/mac/macints.c b/arch/m68k/mac/macints.c
index 0fc72d8f786..ecddac4a02b 100644
--- a/arch/m68k/mac/macints.c
+++ b/arch/m68k/mac/macints.c
@@ -114,6 +114,7 @@
114 * 114 *
115 */ 115 */
116 116
117#include <linux/module.h>
117#include <linux/types.h> 118#include <linux/types.h>
118#include <linux/kernel.h> 119#include <linux/kernel.h>
119#include <linux/sched.h> 120#include <linux/sched.h>
@@ -224,7 +225,7 @@ static struct irq_controller mac_irq_controller = {
224 .disable = mac_disable_irq, 225 .disable = mac_disable_irq,
225}; 226};
226 227
227void mac_init_IRQ(void) 228void __init mac_init_IRQ(void)
228{ 229{
229#ifdef DEBUG_MACINTS 230#ifdef DEBUG_MACINTS
230 printk("mac_init_IRQ(): Setting things up...\n"); 231 printk("mac_init_IRQ(): Setting things up...\n");
@@ -391,6 +392,7 @@ int mac_irq_pending(unsigned int irq)
391 } 392 }
392 return 0; 393 return 0;
393} 394}
395EXPORT_SYMBOL(mac_irq_pending);
394 396
395static int num_debug[8]; 397static int num_debug[8];
396 398
diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c
index f1de19e1dde..f42caa79e4e 100644
--- a/arch/m68k/mm/init.c
+++ b/arch/m68k/mm/init.c
@@ -44,7 +44,7 @@ pg_data_t *pg_data_table[65];
44EXPORT_SYMBOL(pg_data_table); 44EXPORT_SYMBOL(pg_data_table);
45#endif 45#endif
46 46
47void m68k_setup_node(int node) 47void __init m68k_setup_node(int node)
48{ 48{
49#ifndef CONFIG_SINGLE_MEMORY_CHUNK 49#ifndef CONFIG_SINGLE_MEMORY_CHUNK
50 struct mem_info *info = m68k_memory + node; 50 struct mem_info *info = m68k_memory + node;
diff --git a/arch/m68k/mvme147/config.c b/arch/m68k/mvme147/config.c
index 4a7df9c3f85..92fe5071411 100644
--- a/arch/m68k/mvme147/config.c
+++ b/arch/m68k/mvme147/config.c
@@ -89,7 +89,7 @@ static int mvme147_get_hardware_list(char *buffer)
89 * the mvme147 IRQ handling routines. 89 * the mvme147 IRQ handling routines.
90 */ 90 */
91 91
92void mvme147_init_IRQ(void) 92void __init mvme147_init_IRQ(void)
93{ 93{
94 m68k_setup_user_interrupt(VEC_USER, 192, NULL); 94 m68k_setup_user_interrupt(VEC_USER, 192, NULL);
95} 95}
diff --git a/arch/m68k/mvme16x/config.c b/arch/m68k/mvme16x/config.c
index c829ebb6b1a..daa78516140 100644
--- a/arch/m68k/mvme16x/config.c
+++ b/arch/m68k/mvme16x/config.c
@@ -119,7 +119,7 @@ static int mvme16x_get_hardware_list(char *buffer)
119 * that the base vectors for the VMEChip2 and PCCChip2 are valid. 119 * that the base vectors for the VMEChip2 and PCCChip2 are valid.
120 */ 120 */
121 121
122static void mvme16x_init_IRQ (void) 122static void __init mvme16x_init_IRQ (void)
123{ 123{
124 m68k_setup_user_interrupt(VEC_USER, 192, NULL); 124 m68k_setup_user_interrupt(VEC_USER, 192, NULL);
125} 125}
diff --git a/arch/m68k/q40/q40ints.c b/arch/m68k/q40/q40ints.c
index 2fb25ae46a8..ad3ed1fb887 100644
--- a/arch/m68k/q40/q40ints.c
+++ b/arch/m68k/q40/q40ints.c
@@ -79,7 +79,7 @@ static struct irq_controller q40_irq_controller = {
79 79
80static int disabled; 80static int disabled;
81 81
82void q40_init_IRQ(void) 82void __init q40_init_IRQ(void)
83{ 83{
84 m68k_setup_irq_controller(&q40_irq_controller, 1, Q40_IRQ_MAX); 84 m68k_setup_irq_controller(&q40_irq_controller, 1, Q40_IRQ_MAX);
85 85
diff --git a/arch/m68k/sun3/sun3ints.c b/arch/m68k/sun3/sun3ints.c
index 50df34bf80e..cf93481adb1 100644
--- a/arch/m68k/sun3/sun3ints.c
+++ b/arch/m68k/sun3/sun3ints.c
@@ -97,7 +97,7 @@ static struct irq_controller sun3_irq_controller = {
97 .disable = sun3_disable_irq, 97 .disable = sun3_disable_irq,
98}; 98};
99 99
100void sun3_init_IRQ(void) 100void __init sun3_init_IRQ(void)
101{ 101{
102 *sun3_intreg = 1; 102 *sun3_intreg = 1;
103 103
diff --git a/arch/m68k/sun3x/prom.c b/arch/m68k/sun3x/prom.c
index 48f8eb7b156..a7b7e818d62 100644
--- a/arch/m68k/sun3x/prom.c
+++ b/arch/m68k/sun3x/prom.c
@@ -92,7 +92,7 @@ static struct console sun3x_debug = {
92 .index = -1, 92 .index = -1,
93}; 93};
94 94
95void sun3x_prom_init(void) 95void __init sun3x_prom_init(void)
96{ 96{
97 /* Read the vector table */ 97 /* Read the vector table */
98 98