Commit a2387e0a authored by Marc Zyngier's avatar Marc Zyngier
Browse files

Merge remote-tracking branch 'coresight/next-ETE-TRBE' into kvmarm-master/next 



Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parents 3284cd63 68d400c0

drivers/hwtracing/coresight/coresight-core.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include "coresight-priv.h"



static DEFINE_MUTEX(coresight_mutex);

DEFINE_PER_CPU(struct coresight_device *, csdev_sink);

static DEFINE_PER_CPU(struct coresight_device *, csdev_sink);



/**

 * struct coresight_node - elements of a path, from source to sink

drivers/hwtracing/coresight/coresight-trbe.c

+1 −1
Original line number Diff line number Diff line
@@ -871,7 +871,7 @@ static void arm_trbe_register_coresight_cpu(struct trbe_drvdata *drvdata, int cp 


	dev = &cpudata->drvdata->pdev->dev;

	desc.name = devm_kasprintf(dev, GFP_KERNEL, "trbe%d", cpu);

	if (IS_ERR(desc.name))

	if (!desc.name)

		goto cpu_clear;



	desc.type = CORESIGHT_DEV_TYPE_SINK;