diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-06-30 05:58:40 -0400 |
---|---|---|
committer | Greg Ungerer <gerg@uclinux.org> | 2013-08-26 02:51:13 -0400 |
commit | df592eb5dc07c5df26a16318ed4bf2f96fa38a4d (patch) | |
tree | 6f0130f3f936d06941fed9a1ccf09401c488ed10 /arch/m68k | |
parent | d8dfad3876e4386666b759da3c833d62fb8b2267 (diff) |
m68knommu: Mark functions only called from setup_arch() __init
Some functions that are only called (indirectly) from setup_arch() lack
__init annotations.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/kernel/setup_no.c | 2 | ||||
-rw-r--r-- | arch/m68k/platform/68000/m68328.c | 3 | ||||
-rw-r--r-- | arch/m68k/platform/68000/m68EZ328.c | 3 | ||||
-rw-r--r-- | arch/m68k/platform/68000/m68VZ328.c | 9 | ||||
-rw-r--r-- | arch/m68k/platform/68360/commproc.c | 3 | ||||
-rw-r--r-- | arch/m68k/platform/68360/config.c | 3 |
6 files changed, 14 insertions, 9 deletions
diff --git a/arch/m68k/kernel/setup_no.c b/arch/m68k/kernel/setup_no.c index 911ba472e6c4..5b16f5d61b44 100644 --- a/arch/m68k/kernel/setup_no.c +++ b/arch/m68k/kernel/setup_no.c | |||
@@ -118,7 +118,7 @@ void (*mach_power_off)(void); | |||
118 | * | 118 | * |
119 | * Returns: | 119 | * Returns: |
120 | */ | 120 | */ |
121 | void parse_uboot_commandline(char *commandp, int size) | 121 | static void __init parse_uboot_commandline(char *commandp, int size) |
122 | { | 122 | { |
123 | extern unsigned long _init_sp; | 123 | extern unsigned long _init_sp; |
124 | unsigned long *sp; | 124 | unsigned long *sp; |
diff --git a/arch/m68k/platform/68000/m68328.c b/arch/m68k/platform/68000/m68328.c index a86eb66835aa..e53caf4c3bfb 100644 --- a/arch/m68k/platform/68000/m68328.c +++ b/arch/m68k/platform/68000/m68328.c | |||
@@ -15,6 +15,7 @@ | |||
15 | 15 | ||
16 | /***************************************************************************/ | 16 | /***************************************************************************/ |
17 | 17 | ||
18 | #include <linux/init.h> | ||
18 | #include <linux/types.h> | 19 | #include <linux/types.h> |
19 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
20 | #include <linux/rtc.h> | 21 | #include <linux/rtc.h> |
@@ -42,7 +43,7 @@ void m68328_reset (void) | |||
42 | 43 | ||
43 | /***************************************************************************/ | 44 | /***************************************************************************/ |
44 | 45 | ||
45 | void config_BSP(char *command, int len) | 46 | void __init config_BSP(char *command, int len) |
46 | { | 47 | { |
47 | printk(KERN_INFO "\n68328 support D. Jeff Dionne <jeff@uclinux.org>\n"); | 48 | printk(KERN_INFO "\n68328 support D. Jeff Dionne <jeff@uclinux.org>\n"); |
48 | printk(KERN_INFO "68328 support Kenneth Albanowski <kjahds@kjshds.com>\n"); | 49 | printk(KERN_INFO "68328 support Kenneth Albanowski <kjahds@kjshds.com>\n"); |
diff --git a/arch/m68k/platform/68000/m68EZ328.c b/arch/m68k/platform/68000/m68EZ328.c index a6eb72d75008..332b5e8605fc 100644 --- a/arch/m68k/platform/68000/m68EZ328.c +++ b/arch/m68k/platform/68000/m68EZ328.c | |||
@@ -13,6 +13,7 @@ | |||
13 | 13 | ||
14 | /***************************************************************************/ | 14 | /***************************************************************************/ |
15 | 15 | ||
16 | #include <linux/init.h> | ||
16 | #include <linux/types.h> | 17 | #include <linux/types.h> |
17 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
18 | #include <linux/rtc.h> | 19 | #include <linux/rtc.h> |
@@ -52,7 +53,7 @@ _bsc1(unsigned char *, gethwaddr, int, a) | |||
52 | _bsc1(char *, getbenv, char *, a) | 53 | _bsc1(char *, getbenv, char *, a) |
53 | #endif | 54 | #endif |
54 | 55 | ||
55 | void config_BSP(char *command, int len) | 56 | void __init config_BSP(char *command, int len) |
56 | { | 57 | { |
57 | unsigned char *p; | 58 | unsigned char *p; |
58 | 59 | ||
diff --git a/arch/m68k/platform/68000/m68VZ328.c b/arch/m68k/platform/68000/m68VZ328.c index eb6964fbec09..fd6658358af1 100644 --- a/arch/m68k/platform/68000/m68VZ328.c +++ b/arch/m68k/platform/68000/m68VZ328.c | |||
@@ -14,6 +14,7 @@ | |||
14 | 14 | ||
15 | /***************************************************************************/ | 15 | /***************************************************************************/ |
16 | 16 | ||
17 | #include <linux/init.h> | ||
17 | #include <linux/types.h> | 18 | #include <linux/types.h> |
18 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
19 | #include <linux/kd.h> | 20 | #include <linux/kd.h> |
@@ -59,7 +60,7 @@ static void m68vz328_reset(void) | |||
59 | ); | 60 | ); |
60 | } | 61 | } |
61 | 62 | ||
62 | static void init_hardware(char *command, int size) | 63 | static void __init init_hardware(char *command, int size) |
63 | { | 64 | { |
64 | #ifdef CONFIG_DIRECT_IO_ACCESS | 65 | #ifdef CONFIG_DIRECT_IO_ACCESS |
65 | SCR = 0x10; /* allow user access to internal registers */ | 66 | SCR = 0x10; /* allow user access to internal registers */ |
@@ -145,7 +146,7 @@ _bsc0(char *, getserialnum) | |||
145 | _bsc1(unsigned char *, gethwaddr, int, a) | 146 | _bsc1(unsigned char *, gethwaddr, int, a) |
146 | _bsc1(char *, getbenv, char *, a) | 147 | _bsc1(char *, getbenv, char *, a) |
147 | 148 | ||
148 | static void init_hardware(char *command, int size) | 149 | static void __init init_hardware(char *command, int size) |
149 | { | 150 | { |
150 | char *p; | 151 | char *p; |
151 | 152 | ||
@@ -167,7 +168,7 @@ static void m68vz328_reset(void) | |||
167 | { | 168 | { |
168 | } | 169 | } |
169 | 170 | ||
170 | static void init_hardware(char *command, int size) | 171 | static void __init init_hardware(char *command, int size) |
171 | { | 172 | { |
172 | } | 173 | } |
173 | 174 | ||
@@ -175,7 +176,7 @@ static void init_hardware(char *command, int size) | |||
175 | #endif | 176 | #endif |
176 | /***************************************************************************/ | 177 | /***************************************************************************/ |
177 | 178 | ||
178 | void config_BSP(char *command, int size) | 179 | void __init config_BSP(char *command, int size) |
179 | { | 180 | { |
180 | printk(KERN_INFO "68VZ328 DragonBallVZ support (c) 2001 Lineo, Inc.\n"); | 181 | printk(KERN_INFO "68VZ328 DragonBallVZ support (c) 2001 Lineo, Inc.\n"); |
181 | 182 | ||
diff --git a/arch/m68k/platform/68360/commproc.c b/arch/m68k/platform/68360/commproc.c index 8e4e10cc0080..315727b7ff40 100644 --- a/arch/m68k/platform/68360/commproc.c +++ b/arch/m68k/platform/68360/commproc.c | |||
@@ -31,6 +31,7 @@ | |||
31 | */ | 31 | */ |
32 | 32 | ||
33 | #include <linux/errno.h> | 33 | #include <linux/errno.h> |
34 | #include <linux/init.h> | ||
34 | #include <linux/sched.h> | 35 | #include <linux/sched.h> |
35 | #include <linux/kernel.h> | 36 | #include <linux/kernel.h> |
36 | #include <linux/param.h> | 37 | #include <linux/param.h> |
@@ -77,7 +78,7 @@ void m360_cpm_reset(void); | |||
77 | 78 | ||
78 | 79 | ||
79 | 80 | ||
80 | void m360_cpm_reset() | 81 | void __init m360_cpm_reset() |
81 | { | 82 | { |
82 | /* pte_t *pte; */ | 83 | /* pte_t *pte; */ |
83 | 84 | ||
diff --git a/arch/m68k/platform/68360/config.c b/arch/m68k/platform/68360/config.c index 9877cefad1e7..0570741e5500 100644 --- a/arch/m68k/platform/68360/config.c +++ b/arch/m68k/platform/68360/config.c | |||
@@ -11,6 +11,7 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <stdarg.h> | 13 | #include <stdarg.h> |
14 | #include <linux/init.h> | ||
14 | #include <linux/types.h> | 15 | #include <linux/types.h> |
15 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
16 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
@@ -140,7 +141,7 @@ _bsc1(char *, getbenv, char *, a) | |||
140 | #endif | 141 | #endif |
141 | 142 | ||
142 | 143 | ||
143 | void config_BSP(char *command, int len) | 144 | void __init config_BSP(char *command, int len) |
144 | { | 145 | { |
145 | unsigned char *p; | 146 | unsigned char *p; |
146 | 147 | ||