diff options
| author | LEROY Christophe <christophe.leroy@c-s.fr> | 2013-11-22 17:57:31 +0100 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2013-11-22 16:56:48 -0600 |
| commit | ae2163be10ac6090e7aeed72591e2d7fabb1cdda (patch) | |
| tree | 1f6f4ba3beb2358c53bb951e3002c83de824163d /arch/powerpc/kernel/vdso32 | |
| parent | cbf8a358be27ceecea5bd44cf82ab01683fcc90c (diff) | |
| download | blackbird-op-linux-ae2163be10ac6090e7aeed72591e2d7fabb1cdda.tar.gz blackbird-op-linux-ae2163be10ac6090e7aeed72591e2d7fabb1cdda.zip | |
powerpc/8xx: mfspr SPRN_TBRx in lieu of mftb/mftbu is not supported
Commit beb2dc0a7a84be003ce54e98b95d65cc66e6e536 breaks the MPC8xx which
seems to not support using mfspr SPRN_TBRx instead of mftb/mftbu
despite what is written in the reference manual.
This patch reverts to the use of mftb/mftbu when CONFIG_8xx is
selected.
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'arch/powerpc/kernel/vdso32')
| -rw-r--r-- | arch/powerpc/kernel/vdso32/gettimeofday.S | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/vdso32/gettimeofday.S b/arch/powerpc/kernel/vdso32/gettimeofday.S index 6b1f2a6d5517..6b2b69616e77 100644 --- a/arch/powerpc/kernel/vdso32/gettimeofday.S +++ b/arch/powerpc/kernel/vdso32/gettimeofday.S @@ -232,9 +232,15 @@ __do_get_tspec: lwz r6,(CFG_TB_ORIG_STAMP+4)(r9) /* Get a stable TB value */ +#ifdef CONFIG_8xx +2: mftbu r3 + mftbl r4 + mftbu r0 +#else 2: mfspr r3, SPRN_TBRU mfspr r4, SPRN_TBRL mfspr r0, SPRN_TBRU +#endif cmplw cr0,r3,r0 bne- 2b |
