diff options
-rw-r--r-- | arch/blackfin/mm/blackfin_sram.h | 1 | ||||
-rw-r--r-- | arch/blackfin/mm/init.c | 9 | ||||
-rw-r--r-- | arch/blackfin/mm/sram-alloc.c | 5 |
3 files changed, 4 insertions, 11 deletions
diff --git a/arch/blackfin/mm/blackfin_sram.h b/arch/blackfin/mm/blackfin_sram.h index 8cb0945563f9..bc0062884fde 100644 --- a/arch/blackfin/mm/blackfin_sram.h +++ b/arch/blackfin/mm/blackfin_sram.h | |||
@@ -30,7 +30,6 @@ | |||
30 | #ifndef __BLACKFIN_SRAM_H__ | 30 | #ifndef __BLACKFIN_SRAM_H__ |
31 | #define __BLACKFIN_SRAM_H__ | 31 | #define __BLACKFIN_SRAM_H__ |
32 | 32 | ||
33 | extern void bfin_sram_init(void); | ||
34 | extern void *l1sram_alloc(size_t); | 33 | extern void *l1sram_alloc(size_t); |
35 | 34 | ||
36 | #endif | 35 | #endif |
diff --git a/arch/blackfin/mm/init.c b/arch/blackfin/mm/init.c index 9a62b300a396..014a55abd09a 100644 --- a/arch/blackfin/mm/init.c +++ b/arch/blackfin/mm/init.c | |||
@@ -175,15 +175,6 @@ void __init mem_init(void) | |||
175 | initk, codek, datak, DMA_UNCACHED_REGION >> 10, (reservedpages << (PAGE_SHIFT-10))); | 175 | initk, codek, datak, DMA_UNCACHED_REGION >> 10, (reservedpages << (PAGE_SHIFT-10))); |
176 | } | 176 | } |
177 | 177 | ||
178 | static int __init sram_init(void) | ||
179 | { | ||
180 | /* Initialize the blackfin L1 Memory. */ | ||
181 | bfin_sram_init(); | ||
182 | |||
183 | return 0; | ||
184 | } | ||
185 | pure_initcall(sram_init); | ||
186 | |||
187 | static void __init free_init_pages(const char *what, unsigned long begin, unsigned long end) | 178 | static void __init free_init_pages(const char *what, unsigned long begin, unsigned long end) |
188 | { | 179 | { |
189 | unsigned long addr; | 180 | unsigned long addr; |
diff --git a/arch/blackfin/mm/sram-alloc.c b/arch/blackfin/mm/sram-alloc.c index 530d1393a232..36376d8418fa 100644 --- a/arch/blackfin/mm/sram-alloc.c +++ b/arch/blackfin/mm/sram-alloc.c | |||
@@ -223,7 +223,7 @@ static void __init l2_sram_init(void) | |||
223 | spin_lock_init(&l2_sram_lock); | 223 | spin_lock_init(&l2_sram_lock); |
224 | } | 224 | } |
225 | 225 | ||
226 | void __init bfin_sram_init(void) | 226 | static int __init bfin_sram_init(void) |
227 | { | 227 | { |
228 | sram_piece_cache = kmem_cache_create("sram_piece_cache", | 228 | sram_piece_cache = kmem_cache_create("sram_piece_cache", |
229 | sizeof(struct sram_piece), | 229 | sizeof(struct sram_piece), |
@@ -233,7 +233,10 @@ void __init bfin_sram_init(void) | |||
233 | l1_data_sram_init(); | 233 | l1_data_sram_init(); |
234 | l1_inst_sram_init(); | 234 | l1_inst_sram_init(); |
235 | l2_sram_init(); | 235 | l2_sram_init(); |
236 | |||
237 | return 0; | ||
236 | } | 238 | } |
239 | pure_initcall(bfin_sram_init); | ||
237 | 240 | ||
238 | /* SRAM allocate function */ | 241 | /* SRAM allocate function */ |
239 | static void *_sram_alloc(size_t size, struct sram_piece *pfree_head, | 242 | static void *_sram_alloc(size_t size, struct sram_piece *pfree_head, |