From: Christophe Leroy Date: Mon, 11 Mar 2019 08:30:30 +0000 (+0000) Subject: powerpc/32: Remove MSR_PR test when returning from syscall X-Git-Tag: Ubuntu-5.10.0-12.13~5409^2~166 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e291b6d575bc6e4d1d36961b081be521a6c800d6;p=mirror_ubuntu-hirsute-kernel.git powerpc/32: Remove MSR_PR test when returning from syscall syscalls are from user only, so we can account time without checking whether returning to kernel or user as it will only be user. Signed-off-by: Christophe Leroy Signed-off-by: Michael Ellerman --- diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S index b61cfd29c76f..aaf7c5f44823 100644 --- a/arch/powerpc/kernel/entry_32.S +++ b/arch/powerpc/kernel/entry_32.S @@ -422,12 +422,7 @@ BEGIN_FTR_SECTION lwarx r7,0,r1 END_FTR_SECTION_IFSET(CPU_FTR_NEED_PAIRED_STWCX) stwcx. r0,0,r1 /* to clear the reservation */ -#ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE - andi. r4,r8,MSR_PR - beq 3f ACCOUNT_CPU_USER_EXIT(r2, r5, r7) -3: -#endif lwz r4,_LINK(r1) lwz r5,_CCR(r1) mtlr r4