Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70679ee3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp

parents 435d444a b876386e

arch/arm/kernel/entry-armv.S

+7 −0
Original line number Diff line number Diff line
@@ -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}

arch/arm/lib/bitops.h

+3 −1
Original line number Diff line number Diff line 
#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