diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-01 20:36:13 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-01 20:36:13 +0100 |
| commit | f6d2e6f57bba66272b28dd20c949b14ce39cb804 (patch) | |
| tree | 2bf153af4d5b4b33ad2c1e88347c7fd752fb6332 /arch/blackfin/mm/sram-alloc.c | |
| parent | 8caac56305cef98f9357b060a77939d17699937d (diff) | |
| parent | 7b1dedca42ac0d0d0be01e39d8461bb53a2389b3 (diff) | |
Merge branch 'x86/urgent' into x86/iommu
Diffstat (limited to 'arch/blackfin/mm/sram-alloc.c')
| -rw-r--r-- | arch/blackfin/mm/sram-alloc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/blackfin/mm/sram-alloc.c b/arch/blackfin/mm/sram-alloc.c index 0f1ca6930c1..cc6f336e731 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) return; } - free_l2_sram_head.next->paddr = (void *)L2_START + - (_etext_l2 - _stext_l2) + (_edata_l2 - _sdata_l2); - free_l2_sram_head.next->size = L2_LENGTH - - (_etext_l2 - _stext_l2) + (_edata_l2 - _sdata_l2); + free_l2_sram_head.next->paddr = + (void *)L2_START + (_ebss_l2 - _stext_l2); + free_l2_sram_head.next->size = + L2_LENGTH - (_ebss_l2 - _stext_l2); free_l2_sram_head.next->pid = 0; free_l2_sram_head.next->next = NULL; |