]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
powerpc/fsl: Fix the flush of branch predictor.
authorChristophe Leroy <christophe.leroy@c-s.fr>
Tue, 26 Feb 2019 18:18:48 +0000 (18:18 +0000)
committerSeth Forshee <seth.forshee@canonical.com>
Wed, 3 Apr 2019 18:11:41 +0000 (13:11 -0500)
commitf4c7aedae953556abc3b907580c601312122da03
tree81d8b5b8de51dd26c5e95dec5d63b62c40031b5f
parent1072b09609b09063ebb0790223ded45f2b2956a8
powerpc/fsl: Fix the flush of branch predictor.

BugLink: https://bugs.launchpad.net/bugs/1823060
commit 27da80719ef132cf8c80eb406d5aeb37dddf78cc upstream.

The commit identified below adds MC_BTB_FLUSH macro only when
CONFIG_PPC_FSL_BOOK3E is defined. This results in the following error
on some configs (seen several times with kisskb randconfig_defconfig)

arch/powerpc/kernel/exceptions-64e.S:576: Error: Unrecognized opcode: `mc_btb_flush'
make[3]: *** [scripts/Makefile.build:367: arch/powerpc/kernel/exceptions-64e.o] Error 1
make[2]: *** [scripts/Makefile.build:492: arch/powerpc/kernel] Error 2
make[1]: *** [Makefile:1043: arch/powerpc] Error 2
make: *** [Makefile:152: sub-make] Error 2

This patch adds a blank definition of MC_BTB_FLUSH for other cases.

Fixes: 10c5e83afd4a ("powerpc/fsl: Flush the branch predictor at each kernel entry (64bit)")
Cc: Diana Craciun <diana.craciun@nxp.com>
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Reviewed-by: Daniel Axtens <dja@axtens.net>
Reviewed-by: Diana Craciun <diana.craciun@nxp.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
arch/powerpc/kernel/exceptions-64e.S