]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
powerpc/32: Remove MSR_PR test when returning from syscall
authorChristophe Leroy <christophe.leroy@c-s.fr>
Mon, 11 Mar 2019 08:30:30 +0000 (08:30 +0000)
committerMichael Ellerman <mpe@ellerman.id.au>
Sun, 21 Apr 2019 13:11:46 +0000 (23:11 +1000)
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 <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/kernel/entry_32.S

index b61cfd29c76f1fef499b145d37859fbaabf2778d..aaf7c5f44823f06f3dfa7cbba98863d405bc6072 100644 (file)
@@ -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