diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-10 11:05:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-10 11:05:56 -0700 |
| commit | 70679ee34f244499cf1c6775647895123eb1a326 (patch) | |
| tree | f072c008a577663f2e4f3385ed854e0dceaffe34 /arch | |
| parent | 435d444a532af652ba8bdfd4db4424982bea2f69 (diff) | |
| parent | b876386ee47e3ac9375a36e9107b8bd32e0599fc (diff) | |
| download | op-kernel-dev-70679ee34f244499cf1c6775647895123eb1a326.zip op-kernel-dev-70679ee34f244499cf1c6775647895123eb1a326.tar.gz | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/kernel/entry-armv.S | 7 | ||||
| -rw-r--r-- | arch/arm/lib/bitops.h | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 39a6c1b..7152bfb 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -533,6 +533,13 @@ ENTRY(__switch_to) ldr r3, [r2, #TI_TP_VALUE] stmia ip!, {r4 - sl, fp, sp, lr} @ Store most regs on stack ldr r6, [r2, #TI_CPU_DOMAIN]! +#if __LINUX_ARM_ARCH__ >= 6 +#ifdef CONFIG_CPU_MPCORE + clrex +#else + strex r3, r4, [ip] @ Clear exclusive monitor +#endif +#endif #if defined(CONFIG_CPU_XSCALE) && !defined(CONFIG_IWMMXT) mra r4, r5, acc0 stmia ip, {r4, r5} diff --git a/arch/arm/lib/bitops.h b/arch/arm/lib/bitops.h index 2036ff1..64a988c 100644 --- a/arch/arm/lib/bitops.h +++ b/arch/arm/lib/bitops.h @@ -1,4 +1,6 @@ -#if __LINUX_ARM_ARCH__ >= 6 +#include <linux/config.h> + +#if __LINUX_ARM_ARCH__ >= 6 && defined(CONFIG_CPU_MPCORE) .macro bitop, instr mov r2, #1 and r3, r0, #7 @ Get bit offset |
