diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-08 15:07:49 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-08 15:07:49 +0100 |
| commit | aa9c9b8c584a42a094202b7e0f63497e888f86a7 (patch) | |
| tree | 3cb3b022054a7c1722657288518f495e0c4d9983 /arch/blackfin/mm/sram-alloc.c | |
| parent | 87f7606591aea6a8a38ea4c8911b5eeeee2740b8 (diff) | |
| parent | 218d11a8b071b23b76c484fd5f72a4fe3306801e (diff) | |
| download | linux-aa9c9b8c584a42a094202b7e0f63497e888f86a7.tar.gz linux-aa9c9b8c584a42a094202b7e0f63497e888f86a7.tar.bz2 linux-aa9c9b8c584a42a094202b7e0f63497e888f86a7.zip | |
Merge branch 'linus' into x86/quirks
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 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) 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; |