diff options
author | Mike Frysinger <vapier.adi@gmail.com> | 2008-04-23 18:20:11 -0400 |
---|---|---|
committer | Bryan Wu <cooloney@kernel.org> | 2008-04-23 18:20:11 -0400 |
commit | 9f8e895d6cc2f871bca6df2ad6791671de2adeae (patch) | |
tree | ea663fdd1bfe54ad9d52e86642cdeec07aa09a7d /arch | |
parent | b85b82d980526d683dc3b39f2ac1f447fa84a105 (diff) |
[Blackfin] arch: now that we can panic() early, dont need the delayed L1 overflow check
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/blackfin/kernel/setup.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c index c494495af40d..c2f3e73ba25a 100644 --- a/arch/blackfin/kernel/setup.c +++ b/arch/blackfin/kernel/setup.c | |||
@@ -129,7 +129,6 @@ void __init bf53x_relocate_l1_mem(void) | |||
129 | /* Copy _sdata_b_l1 to _ebss_b_l1 to L1 data bank B SRAM */ | 129 | /* Copy _sdata_b_l1 to _ebss_b_l1 to L1 data bank B SRAM */ |
130 | dma_memcpy(_sdata_b_l1, _l1_lma_start + l1_code_length + | 130 | dma_memcpy(_sdata_b_l1, _l1_lma_start + l1_code_length + |
131 | l1_data_a_length, l1_data_b_length); | 131 | l1_data_a_length, l1_data_b_length); |
132 | |||
133 | } | 132 | } |
134 | 133 | ||
135 | /* add_memory_region to memmap */ | 134 | /* add_memory_region to memmap */ |
@@ -652,7 +651,7 @@ static __init void setup_bootmem_allocator(void) | |||
652 | 651 | ||
653 | void __init setup_arch(char **cmdline_p) | 652 | void __init setup_arch(char **cmdline_p) |
654 | { | 653 | { |
655 | unsigned long l1_length, sclk, cclk; | 654 | unsigned long sclk, cclk; |
656 | 655 | ||
657 | #ifdef CONFIG_DUMMY_CONSOLE | 656 | #ifdef CONFIG_DUMMY_CONSOLE |
658 | conswitchp = &dummy_con; | 657 | conswitchp = &dummy_con; |
@@ -751,15 +750,6 @@ void __init setup_arch(char **cmdline_p) | |||
751 | 750 | ||
752 | paging_init(); | 751 | paging_init(); |
753 | 752 | ||
754 | /* check the size of the l1 area */ | ||
755 | l1_length = _etext_l1 - _stext_l1; | ||
756 | if (l1_length > L1_CODE_LENGTH) | ||
757 | panic("L1 code memory overflow\n"); | ||
758 | |||
759 | l1_length = _ebss_l1 - _sdata_l1; | ||
760 | if (l1_length > L1_DATA_A_LENGTH) | ||
761 | panic("L1 data memory overflow\n"); | ||
762 | |||
763 | /* Copy atomic sequences to their fixed location, and sanity check that | 753 | /* Copy atomic sequences to their fixed location, and sanity check that |
764 | these locations are the ones that we advertise to userspace. */ | 754 | these locations are the ones that we advertise to userspace. */ |
765 | memcpy((void *)FIXED_CODE_START, &fixed_code_start, | 755 | memcpy((void *)FIXED_CODE_START, &fixed_code_start, |