Merge master.kernel.org:/home/rmk/linux-2.6-arm (7f28f394) · Commits · e / devices / android_kernel_oneplus_sm7250

arch/arm/kernel/entry-armv.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -537,7 +537,7 @@ ENTRY(__switch_to)
		#ifdef CONFIG_CPU_MPCORE
		clrex
		#else
		strex r3, r4, [ip] @ Clear exclusive monitor
		strex r5, r4, [ip] @ Clear exclusive monitor
		#endif
		#endif
		#if defined(CONFIG_CPU_XSCALE) && !defined(CONFIG_IWMMXT)