]> git.baikalelectronics.ru Git - kernel.git/commit
coresight: etm4x: Fix merge resolution for amba rework
authorUwe Kleine-König <uwe@kleine-koenig.org>
Fri, 5 Feb 2021 13:08:47 +0000 (14:08 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 5 Feb 2021 14:02:48 +0000 (15:02 +0100)
commitf22d6e268c99a153f632ea59b14cedecb425e4a6
tree6eb732145a8b89a024c8e5eec23591181470b354
parent88550502e82e0808a0d981e6a4fa516f922ffd04
coresight: etm4x: Fix merge resolution for amba rework

This was non-trivial to get right because commits
1616621bc800 ("coresight: etm4x: Refactor probing routine") and
644d2d2bb060 ("coresight: etm4x: Add support for sysreg only devices")
changed the code flow considerably. With this change the driver can be
built again.

Fixes: 443db4f5dd2e ("Merge branch 'devel-stable' of git://git.armlinux.org.uk/~rmk/linux-arm into char-misc-next")
Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org>
Link: https://lore.kernel.org/r/20210205130848.20009-1-uwe@kleine-koenig.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/hwtracing/coresight/coresight-etm4x-core.c