Commit a4df02a2 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

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

arch/m68k/amiga/config.c

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ static struct resource ram_resource[NUM_MEMINFO]; 
     *  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;

	const unsigned long *data = record->data;

arch/m68k/apollo/config.c

+5 −5
Original line number Diff line number Diff line 
#include <linux/init.h>

#include <linux/types.h>

#include <linux/kernel.h>

#include <linux/mm.h>
@@ -43,8 +44,8 @@ static const char *apollo_models[] = { 
	[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;

	const unsigned long *data = record->data;
@@ -60,9 +61,8 @@ int apollo_parse_bootinfo(const struct bi_record *record) { 
	return unknown;

}



void dn_setup_model(void) {





static void __init dn_setup_model(void)

{

	printk("Apollo hardware found: ");

	printk("[%s]\n", apollo_models[apollo_model - APOLLO_DN3000]);

arch/m68k/bvme6000/config.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ void bvme6000_set_vectors (void); 
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)

		return 0;

arch/m68k/emu/natfeat.c

+2 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 * the GNU General Public License (GPL), incorporated herein by reference.

 */



#include <linux/init.h>

#include <linux/types.h>

#include <linux/console.h>

#include <linux/string.h>
@@ -70,7 +71,7 @@ static void nf_poweroff(void) 
		nf_call(id);

}



void nf_init(void)

void __init nf_init(void)

{

	unsigned long id, version;

	char buf[256];

arch/m68k/kernel/setup_mm.c

+2 −2
Original line number Diff line number Diff line
@@ -74,9 +74,9 @@ unsigned long m68k_memoffset; 
struct mem_info m68k_memory[NUM_MEMINFO];

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;

/* machine dependent irq functions */