diff options
| author | Greg Ungerer <gerg@linux-m68k.org> | 2016-08-23 16:29:43 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@linux-m68k.org> | 2016-09-26 12:02:57 +1000 |
| commit | bc065e4784beefdead3e62c31fa5ff7fbb1d7f9e (patch) | |
| tree | c2631da8353074c2e9a295fe1523ca83cb8e2822 | |
| parent | 08895a8b6b06ed2323cd97a36ee40a116b3db8ed (diff) | |
m68knommu: fix early setup to not access variables
The early setup code for the ColdFire 53xx platform accesses variables
before the RAM and other system initialization steps may have taken place.
Currently it has 2 global variables that will end up in the bss section
that are accessed during this early setup. There is a special static RAM
stack setup at this time, but not necessarily the RAM where kernel data
sections will end up.
Even on system setups where RAM is setup by a boot loader the access
to the early setup variables is before the BSS section has been initialized.
This can potentially corrupt a ram loaded root filesystem that sits in that
memory area before it has been moved.
These 2 variables are not used at all after being set, and can just be
removed.
Reported-by: Christian Gieseler <christiangieseler@yahoo.de>
Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
| -rw-r--r-- | arch/m68k/coldfire/m53xx.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/m68k/coldfire/m53xx.c b/arch/m68k/coldfire/m53xx.c index 80879a7fe3d5..2502f63960bc 100644 --- a/arch/m68k/coldfire/m53xx.c +++ b/arch/m68k/coldfire/m53xx.c @@ -271,9 +271,6 @@ void __init config_BSP(char *commandp, int size) #define NAND_FLASH_ADDRESS (0xD0000000) -int sys_clk_khz = 0; -int sys_clk_mhz = 0; - void wtm_init(void); void scm_init(void); void gpio_init(void); @@ -286,9 +283,8 @@ int get_sys_clock (void); asmlinkage void __init sysinit(void) { - sys_clk_khz = clock_pll(0, 0); - sys_clk_mhz = sys_clk_khz/1000; - + clock_pll(0, 0); + wtm_init(); scm_init(); gpio_init(); |