diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-02 18:28:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-02 18:28:32 -0700 |
| commit | c77054e518d9163578cfcad09826d7b959f95ece (patch) | |
| tree | b91725791a44b2ab14cb65ef35b9a4deb5ef59e3 /arch | |
| parent | 75f8426c17bc091260a6f7536ba10767596e15eb (diff) | |
| parent | 2c3a0540999ac9bd7147fb98833224a58cdaf217 (diff) | |
| download | op-kernel-dev-c77054e518d9163578cfcad09826d7b959f95ece.zip op-kernel-dev-c77054e518d9163578cfcad09826d7b959f95ece.tar.gz | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mm/abort-ev6.S | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mm/abort-ev6.S b/arch/arm/mm/abort-ev6.S index 8f76f3d..dbd3460 100644 --- a/arch/arm/mm/abort-ev6.S +++ b/arch/arm/mm/abort-ev6.S @@ -20,6 +20,11 @@ */ .align 5 ENTRY(v6_early_abort) +#ifdef CONFIG_CPU_MPCORE + clrex +#else + strex r0, r1, [sp] @ Clear the exclusive monitor +#endif mrc p15, 0, r1, c5, c0, 0 @ get FSR mrc p15, 0, r0, c6, c0, 0 @ get FAR /* |
