commit 7f28f394bd68e58bf3938c67bbeca7825b4687b8 · tjh.dev/kernel

tjh.dev / kernel

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

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

Linus Torvalds 20 years ago 7f28f394 dbdb9045

+1 -1

1 changed file

expand all

unified split

arch

arm

kernel

entry-armv.S

+1 -1

arch/arm/kernel/entry-armv.S

··· 537 537 #ifdef CONFIG_CPU_MPCORE 538 538 clrex 539 539 #else 540 - strex r3, r4, [ip] @ Clear exclusive monitor 540 + strex r5, r4, [ip] @ Clear exclusive monitor 541 541 #endif 542 542 #endif 543 543 #if defined(CONFIG_CPU_XSCALE) && !defined(CONFIG_IWMMXT)