Commit 66a3f820 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds

m68k: missing __init

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 88f8bb78
...@@ -148,8 +148,8 @@ void dn_serial_print (const char *str) ...@@ -148,8 +148,8 @@ void dn_serial_print (const char *str)
} }
} }
void config_apollo(void) { void __init config_apollo(void)
{
int i; int i;
dn_setup_model(); dn_setup_model();
......
...@@ -37,7 +37,7 @@ static struct irq_controller apollo_irq_controller = { ...@@ -37,7 +37,7 @@ static struct irq_controller apollo_irq_controller = {
}; };
void dn_init_IRQ(void) void __init dn_init_IRQ(void)
{ {
m68k_setup_user_interrupt(VEC_USER + 96, 16, dn_process_int); m68k_setup_user_interrupt(VEC_USER + 96, 16, dn_process_int);
m68k_setup_irq_controller(&apollo_irq_controller, IRQ_APOLLO, 16); m68k_setup_irq_controller(&apollo_irq_controller, IRQ_APOLLO, 16);
......
...@@ -97,7 +97,7 @@ static int bvme6000_get_hardware_list(char *buffer) ...@@ -97,7 +97,7 @@ static int bvme6000_get_hardware_list(char *buffer)
* This function is called during kernel startup to initialize * This function is called during kernel startup to initialize
* the bvme6000 IRQ handling routines. * the bvme6000 IRQ handling routines.
*/ */
static void bvme6000_init_IRQ(void) static void __init bvme6000_init_IRQ(void)
{ {
m68k_setup_user_interrupt(VEC_USER, 192, NULL); m68k_setup_user_interrupt(VEC_USER, 192, NULL);
} }
......
...@@ -72,7 +72,7 @@ static irqreturn_t timer_interrupt(int irq, void *dummy) ...@@ -72,7 +72,7 @@ static irqreturn_t timer_interrupt(int irq, void *dummy)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
void time_init(void) void __init time_init(void)
{ {
struct rtc_time time; struct rtc_time time;
......
...@@ -85,7 +85,7 @@ extern void nubus_sweep_video(void); ...@@ -85,7 +85,7 @@ extern void nubus_sweep_video(void);
static void mac_get_model(char *str); static void mac_get_model(char *str);
static void mac_sched_init(irq_handler_t vector) static void __init mac_sched_init(irq_handler_t vector)
{ {
via_init_clock(vector); via_init_clock(vector);
} }
...@@ -770,7 +770,7 @@ static struct mac_model mac_data_table[] = { ...@@ -770,7 +770,7 @@ static struct mac_model mac_data_table[] = {
} }
}; };
void mac_identify(void) void __init mac_identify(void)
{ {
struct mac_model *m; struct mac_model *m;
...@@ -847,7 +847,7 @@ void mac_identify(void) ...@@ -847,7 +847,7 @@ void mac_identify(void)
baboon_init(); baboon_init();
} }
void mac_report_hardware(void) void __init mac_report_hardware(void)
{ {
printk(KERN_INFO "Apple Macintosh %s\n", macintosh_config->name); printk(KERN_INFO "Apple Macintosh %s\n", macintosh_config->name);
} }
......
...@@ -114,6 +114,7 @@ ...@@ -114,6 +114,7 @@
* *
*/ */
#include <linux/module.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/sched.h> #include <linux/sched.h>
...@@ -224,7 +225,7 @@ static struct irq_controller mac_irq_controller = { ...@@ -224,7 +225,7 @@ static struct irq_controller mac_irq_controller = {
.disable = mac_disable_irq, .disable = mac_disable_irq,
}; };
void mac_init_IRQ(void) void __init mac_init_IRQ(void)
{ {
#ifdef DEBUG_MACINTS #ifdef DEBUG_MACINTS
printk("mac_init_IRQ(): Setting things up...\n"); printk("mac_init_IRQ(): Setting things up...\n");
...@@ -391,6 +392,7 @@ int mac_irq_pending(unsigned int irq) ...@@ -391,6 +392,7 @@ int mac_irq_pending(unsigned int irq)
} }
return 0; return 0;
} }
EXPORT_SYMBOL(mac_irq_pending);
static int num_debug[8]; static int num_debug[8];
......
...@@ -44,7 +44,7 @@ pg_data_t *pg_data_table[65]; ...@@ -44,7 +44,7 @@ pg_data_t *pg_data_table[65];
EXPORT_SYMBOL(pg_data_table); EXPORT_SYMBOL(pg_data_table);
#endif #endif
void m68k_setup_node(int node) void __init m68k_setup_node(int node)
{ {
#ifndef CONFIG_SINGLE_MEMORY_CHUNK #ifndef CONFIG_SINGLE_MEMORY_CHUNK
struct mem_info *info = m68k_memory + node; struct mem_info *info = m68k_memory + node;
......
...@@ -89,7 +89,7 @@ static int mvme147_get_hardware_list(char *buffer) ...@@ -89,7 +89,7 @@ static int mvme147_get_hardware_list(char *buffer)
* the mvme147 IRQ handling routines. * the mvme147 IRQ handling routines.
*/ */
void mvme147_init_IRQ(void) void __init mvme147_init_IRQ(void)
{ {
m68k_setup_user_interrupt(VEC_USER, 192, NULL); m68k_setup_user_interrupt(VEC_USER, 192, NULL);
} }
......
...@@ -119,7 +119,7 @@ static int mvme16x_get_hardware_list(char *buffer) ...@@ -119,7 +119,7 @@ static int mvme16x_get_hardware_list(char *buffer)
* that the base vectors for the VMEChip2 and PCCChip2 are valid. * that the base vectors for the VMEChip2 and PCCChip2 are valid.
*/ */
static void mvme16x_init_IRQ (void) static void __init mvme16x_init_IRQ (void)
{ {
m68k_setup_user_interrupt(VEC_USER, 192, NULL); m68k_setup_user_interrupt(VEC_USER, 192, NULL);
} }
......
...@@ -79,7 +79,7 @@ static struct irq_controller q40_irq_controller = { ...@@ -79,7 +79,7 @@ static struct irq_controller q40_irq_controller = {
static int disabled; static int disabled;
void q40_init_IRQ(void) void __init q40_init_IRQ(void)
{ {
m68k_setup_irq_controller(&q40_irq_controller, 1, Q40_IRQ_MAX); m68k_setup_irq_controller(&q40_irq_controller, 1, Q40_IRQ_MAX);
......
...@@ -97,7 +97,7 @@ static struct irq_controller sun3_irq_controller = { ...@@ -97,7 +97,7 @@ static struct irq_controller sun3_irq_controller = {
.disable = sun3_disable_irq, .disable = sun3_disable_irq,
}; };
void sun3_init_IRQ(void) void __init sun3_init_IRQ(void)
{ {
*sun3_intreg = 1; *sun3_intreg = 1;
......
...@@ -92,7 +92,7 @@ static struct console sun3x_debug = { ...@@ -92,7 +92,7 @@ static struct console sun3x_debug = {
.index = -1, .index = -1,
}; };
void sun3x_prom_init(void) void __init sun3x_prom_init(void)
{ {
/* Read the vector table */ /* Read the vector table */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment