diff options
-rw-r--r-- | arch/blackfin/kernel/process.c | 7 | ||||
-rw-r--r-- | arch/blackfin/mm/sram-alloc.c | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/arch/blackfin/kernel/process.c b/arch/blackfin/kernel/process.c index 77800dd83e57..0c3ea118b657 100644 --- a/arch/blackfin/kernel/process.c +++ b/arch/blackfin/kernel/process.c | |||
@@ -351,10 +351,15 @@ int _access_ok(unsigned long addr, unsigned long size) | |||
351 | return 1; | 351 | return 1; |
352 | #endif | 352 | #endif |
353 | #if L1_DATA_B_LENGTH != 0 | 353 | #if L1_DATA_B_LENGTH != 0 |
354 | if (addr >= L1_DATA_B_START | 354 | if (addr >= L1_DATA_B_START + (_ebss_b_l1 - _sdata_b_l1) |
355 | && addr + size <= L1_DATA_B_START + L1_DATA_B_LENGTH) | 355 | && addr + size <= L1_DATA_B_START + L1_DATA_B_LENGTH) |
356 | return 1; | 356 | return 1; |
357 | #endif | 357 | #endif |
358 | #if L2_LENGTH != 0 | ||
359 | if (addr >= L2_START + (_ebss_l2 - _stext_l2) | ||
360 | && addr + size <= L2_START + L2_LENGTH) | ||
361 | return 1; | ||
362 | #endif | ||
358 | return 0; | 363 | return 0; |
359 | } | 364 | } |
360 | EXPORT_SYMBOL(_access_ok); | 365 | EXPORT_SYMBOL(_access_ok); |
diff --git a/arch/blackfin/mm/sram-alloc.c b/arch/blackfin/mm/sram-alloc.c index 0f1ca6930c16..cc6f336e7313 100644 --- a/arch/blackfin/mm/sram-alloc.c +++ b/arch/blackfin/mm/sram-alloc.c | |||
@@ -183,10 +183,10 @@ static void __init l2_sram_init(void) | |||
183 | return; | 183 | return; |
184 | } | 184 | } |
185 | 185 | ||
186 | free_l2_sram_head.next->paddr = (void *)L2_START + | 186 | free_l2_sram_head.next->paddr = |
187 | (_etext_l2 - _stext_l2) + (_edata_l2 - _sdata_l2); | 187 | (void *)L2_START + (_ebss_l2 - _stext_l2); |
188 | free_l2_sram_head.next->size = L2_LENGTH - | 188 | free_l2_sram_head.next->size = |
189 | (_etext_l2 - _stext_l2) + (_edata_l2 - _sdata_l2); | 189 | L2_LENGTH - (_ebss_l2 - _stext_l2); |
190 | free_l2_sram_head.next->pid = 0; | 190 | free_l2_sram_head.next->pid = 0; |
191 | free_l2_sram_head.next->next = NULL; | 191 | free_l2_sram_head.next->next = NULL; |
192 | 192 | ||