Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 92318
b: refs/heads/master
c: 9f8e895
h: refs/heads/master
v: v3
  • Loading branch information
Mike Frysinger authored and Bryan Wu committed Apr 23, 2008
1 parent 0eca5c1 commit 8c7f42e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b85b82d980526d683dc3b39f2ac1f447fa84a105
refs/heads/master: 9f8e895d6cc2f871bca6df2ad6791671de2adeae
12 changes: 1 addition & 11 deletions trunk/arch/blackfin/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ void __init bf53x_relocate_l1_mem(void)
/* Copy _sdata_b_l1 to _ebss_b_l1 to L1 data bank B SRAM */
dma_memcpy(_sdata_b_l1, _l1_lma_start + l1_code_length +
l1_data_a_length, l1_data_b_length);

}

/* add_memory_region to memmap */
Expand Down Expand Up @@ -652,7 +651,7 @@ static __init void setup_bootmem_allocator(void)

void __init setup_arch(char **cmdline_p)
{
unsigned long l1_length, sclk, cclk;
unsigned long sclk, cclk;

#ifdef CONFIG_DUMMY_CONSOLE
conswitchp = &dummy_con;
Expand Down Expand Up @@ -751,15 +750,6 @@ void __init setup_arch(char **cmdline_p)

paging_init();

/* check the size of the l1 area */
l1_length = _etext_l1 - _stext_l1;
if (l1_length > L1_CODE_LENGTH)
panic("L1 code memory overflow\n");

l1_length = _ebss_l1 - _sdata_l1;
if (l1_length > L1_DATA_A_LENGTH)
panic("L1 data memory overflow\n");

/* Copy atomic sequences to their fixed location, and sanity check that
these locations are the ones that we advertise to userspace. */
memcpy((void *)FIXED_CODE_START, &fixed_code_start,
Expand Down

0 comments on commit 8c7f42e

Please sign in to comment.