Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4a13c6dc6443786b135c9e9b3f9dc87421cc1ae3

Authored by Greg Ungerer
1 parent 3731454033
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

m68k: ColdFire with MMU enabled uses same clocking code as non-MMU 

We want to use the same timer support code for ColdFire CPU's when
running with MMU enabled or not. So use the same time_no.c code even
when the MMU is enabled for ColdFire. This also means we do not want
CONFIG_ARCH_USES_GETTIMEOFFSET set, since that code is only in time_mm.c.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Matt Waddel <mwaddel@yahoo.com>
Acked-by: Kurt Mahan <kmahan@xmission.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

Showing 2 changed files with 2 additions and 2 deletions Side-by-side Diff

... ... @@ -48,7 +48,7 @@
48 48 default y
49 49  
50 50 config ARCH_USES_GETTIMEOFFSET
51   - def_bool MMU
  51 + def_bool MMU && !COLDFIRE
52 52  
53 53 config NO_IOPORT
54 54 def_bool y
arch/m68k/kernel/time.c
Diff comments   View file @ 4a13c6d
1   -#ifdef CONFIG_MMU
  1 +#if defined(CONFIG_MMU) && !defined(CONFIG_COLDFIRE)
2 2 #include "time_mm.c"
3 3 #else
4 4 #include "time_no.c"