Merge branch 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / drivers / hwtracing / coresight / coresight-etm4x.c

diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c
index 532adc9..cf364a5 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-etm4x.c
+++ b/drivers/hwtracing/coresight/coresight-etm4x.c
@@ -224,6 +224,10 @@ static int etm4_parse_event_config(struct etmv4_drvdata *drvdata,
        if (attr->config & BIT(ETM_OPT_TS))
                /* bit[11], Global timestamp tracing bit */
                config->cfg |= BIT(11);
+       /* return stack - enable if selected and supported */
+       if ((attr->config & BIT(ETM_OPT_RETSTK)) && drvdata->retstack)
+               /* bit[12], Return stack enable bit */
+               config->cfg |= BIT(12);
 
 out:
        return ret;
@@ -1048,7 +1052,7 @@ err_arch_supported:
        return ret;
 }
 
-static struct amba_id etm4_ids[] = {
+static const struct amba_id etm4_ids[] = {
        {       /* ETM 4.0 - Cortex-A53  */
                .id     = 0x000bb95d,
                .mask   = 0x000fffff,