Commit a4df02a2 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven

m68k: Mark functions only called from setup_arch() __init

Some functions that are only called (indirectly) from setup_arch() lack
__init annotations.
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 6ce4eac1
...@@ -140,7 +140,7 @@ static struct resource ram_resource[NUM_MEMINFO]; ...@@ -140,7 +140,7 @@ static struct resource ram_resource[NUM_MEMINFO];
* Parse an Amiga-specific record in the bootinfo * Parse an Amiga-specific record in the bootinfo
*/ */
int amiga_parse_bootinfo(const struct bi_record *record) int __init amiga_parse_bootinfo(const struct bi_record *record)
{ {
int unknown = 0; int unknown = 0;
const unsigned long *data = record->data; const unsigned long *data = record->data;
......
#include <linux/init.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mm.h> #include <linux/mm.h>
...@@ -43,8 +44,8 @@ static const char *apollo_models[] = { ...@@ -43,8 +44,8 @@ static const char *apollo_models[] = {
[APOLLO_DN4500-APOLLO_DN3000] = "DN4500 (Roadrunner)" [APOLLO_DN4500-APOLLO_DN3000] = "DN4500 (Roadrunner)"
}; };
int apollo_parse_bootinfo(const struct bi_record *record) { int __init apollo_parse_bootinfo(const struct bi_record *record)
{
int unknown = 0; int unknown = 0;
const unsigned long *data = record->data; const unsigned long *data = record->data;
...@@ -60,9 +61,8 @@ int apollo_parse_bootinfo(const struct bi_record *record) { ...@@ -60,9 +61,8 @@ int apollo_parse_bootinfo(const struct bi_record *record) {
return unknown; return unknown;
} }
void dn_setup_model(void) { static void __init dn_setup_model(void)
{
printk("Apollo hardware found: "); printk("Apollo hardware found: ");
printk("[%s]\n", apollo_models[apollo_model - APOLLO_DN3000]); printk("[%s]\n", apollo_models[apollo_model - APOLLO_DN3000]);
......
...@@ -50,7 +50,7 @@ void bvme6000_set_vectors (void); ...@@ -50,7 +50,7 @@ void bvme6000_set_vectors (void);
static irq_handler_t tick_handler; static irq_handler_t tick_handler;
int bvme6000_parse_bootinfo(const struct bi_record *bi) int __init bvme6000_parse_bootinfo(const struct bi_record *bi)
{ {
if (bi->tag == BI_VME_TYPE) if (bi->tag == BI_VME_TYPE)
return 0; return 0;
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
* the GNU General Public License (GPL), incorporated herein by reference. * the GNU General Public License (GPL), incorporated herein by reference.
*/ */
#include <linux/init.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/console.h> #include <linux/console.h>
#include <linux/string.h> #include <linux/string.h>
...@@ -70,7 +71,7 @@ static void nf_poweroff(void) ...@@ -70,7 +71,7 @@ static void nf_poweroff(void)
nf_call(id); nf_call(id);
} }
void nf_init(void) void __init nf_init(void)
{ {
unsigned long id, version; unsigned long id, version;
char buf[256]; char buf[256];
......
...@@ -74,9 +74,9 @@ unsigned long m68k_memoffset; ...@@ -74,9 +74,9 @@ unsigned long m68k_memoffset;
struct mem_info m68k_memory[NUM_MEMINFO]; struct mem_info m68k_memory[NUM_MEMINFO];
EXPORT_SYMBOL(m68k_memory); EXPORT_SYMBOL(m68k_memory);
struct mem_info m68k_ramdisk; static struct mem_info m68k_ramdisk __initdata;
static char m68k_command_line[CL_SIZE]; static char m68k_command_line[CL_SIZE] __initdata;
void (*mach_sched_init) (irq_handler_t handler) __initdata = NULL; void (*mach_sched_init) (irq_handler_t handler) __initdata = NULL;
/* machine dependent irq functions */ /* machine dependent irq functions */
......
...@@ -54,7 +54,7 @@ static void psc_debug_dump(void) ...@@ -54,7 +54,7 @@ static void psc_debug_dump(void)
* expanded to cover what I think are the other 7 channels. * expanded to cover what I think are the other 7 channels.
*/ */
static void psc_dma_die_die_die(void) static __init void psc_dma_die_die_die(void)
{ {
int i; int i;
......
...@@ -51,7 +51,7 @@ static int bcd2int (unsigned char b); ...@@ -51,7 +51,7 @@ static int bcd2int (unsigned char b);
irq_handler_t tick_handler; irq_handler_t tick_handler;
int mvme147_parse_bootinfo(const struct bi_record *bi) int __init mvme147_parse_bootinfo(const struct bi_record *bi)
{ {
if (bi->tag == BI_VME_TYPE || bi->tag == BI_VME_BRDINFO) if (bi->tag == BI_VME_TYPE || bi->tag == BI_VME_BRDINFO)
return 0; return 0;
......
...@@ -60,7 +60,7 @@ unsigned short mvme16x_config; ...@@ -60,7 +60,7 @@ unsigned short mvme16x_config;
EXPORT_SYMBOL(mvme16x_config); EXPORT_SYMBOL(mvme16x_config);
int mvme16x_parse_bootinfo(const struct bi_record *bi) int __init mvme16x_parse_bootinfo(const struct bi_record *bi)
{ {
if (bi->tag == BI_VME_TYPE || bi->tag == BI_VME_BRDINFO) if (bi->tag == BI_VME_TYPE || bi->tag == BI_VME_BRDINFO)
return 0; return 0;
......
...@@ -154,7 +154,7 @@ static unsigned int serports[] = ...@@ -154,7 +154,7 @@ static unsigned int serports[] =
0x3f8,0x2f8,0x3e8,0x2e8,0 0x3f8,0x2f8,0x3e8,0x2e8,0
}; };
static void q40_disable_irqs(void) static void __init q40_disable_irqs(void)
{ {
unsigned i, j; unsigned i, j;
...@@ -198,7 +198,7 @@ void __init config_q40(void) ...@@ -198,7 +198,7 @@ void __init config_q40(void)
} }
int q40_parse_bootinfo(const struct bi_record *rec) int __init q40_parse_bootinfo(const struct bi_record *rec)
{ {
return 1; return 1;
} }
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
* *
*/ */
#include <linux/init.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/bootmem.h> #include <linux/bootmem.h>
...@@ -62,10 +63,7 @@ int dvma_map_iommu(unsigned long kaddr, unsigned long baddr, ...@@ -62,10 +63,7 @@ int dvma_map_iommu(unsigned long kaddr, unsigned long baddr,
} }
void sun3_dvma_init(void) void __init sun3_dvma_init(void)
{ {
memset(ptelist, 0, sizeof(ptelist)); memset(ptelist, 0, sizeof(ptelist));
} }
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
** Started 1/16/98 @ 2:22 am ** Started 1/16/98 @ 2:22 am
*/ */
#include <linux/init.h>
#include <linux/mman.h> #include <linux/mman.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/kernel.h> #include <linux/kernel.h>
...@@ -122,7 +123,7 @@ void print_pte_vaddr (unsigned long vaddr) ...@@ -122,7 +123,7 @@ void print_pte_vaddr (unsigned long vaddr)
/* /*
* Initialise the MMU emulator. * Initialise the MMU emulator.
*/ */
void mmu_emu_init(unsigned long bootmem_end) void __init mmu_emu_init(unsigned long bootmem_end)
{ {
unsigned long seg, num; unsigned long seg, num;
int i,j; int i,j;
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
* Contains common routines for sun3/sun3x DVMA management. * Contains common routines for sun3/sun3x DVMA management.
*/ */
#include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/gfp.h> #include <linux/gfp.h>
...@@ -245,7 +246,7 @@ static inline int free_baddr(unsigned long baddr) ...@@ -245,7 +246,7 @@ static inline int free_baddr(unsigned long baddr)
} }
void dvma_init(void) void __init dvma_init(void)
{ {
struct hole *hole; struct hole *hole;
......
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