diff --git a/[refs] b/[refs] index 54ff1e167be5..fb13254ef1e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 581d62ab304fb43d2ae4de06527676661b171cf6 +refs/heads/master: 43a3188ea348c41a197a754164ff96cc48124d85 diff --git a/trunk/arch/blackfin/mm/blackfin_sram.c b/trunk/arch/blackfin/mm/blackfin_sram.c index dbb37b8854f5..68107924639e 100644 --- a/trunk/arch/blackfin/mm/blackfin_sram.c +++ b/trunk/arch/blackfin/mm/blackfin_sram.c @@ -109,8 +109,9 @@ void __init l1_data_sram_init(void) #endif #if L1_DATA_B_LENGTH != 0 memset(&l1_data_B_sram, 0x00, sizeof(l1_data_B_sram)); - l1_data_B_sram[0].paddr = (void*)L1_DATA_B_START; - l1_data_B_sram[0].size = L1_DATA_B_LENGTH; + l1_data_B_sram[0].paddr = (void *)L1_DATA_B_START + + (_ebss_b_l1 - _sdata_b_l1); + l1_data_B_sram[0].size = L1_DATA_B_LENGTH - (_ebss_b_l1 - _sdata_b_l1); l1_data_B_sram[0].flag = SRAM_SLT_FREE; printk(KERN_INFO "Blackfin Data B SRAM: %d KB (%d KB free)\n",