Merge branch 'v4.4/topic/coresight' into linux-linaro-lsk-v4.4

Alex Shi · Alex Shi · commit 96597f605d63 · 2017-03-24T11:27:10.000+08:00
diff --git a/drivers/hwtracing/coresight/coresight-tmc.c b/drivers/hwtracing/coresight/coresight-tmc.c
@@ -388,9 +388,6 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id)
 err_misc_register:
 	coresight_unregister(drvdata->csdev);
 err_devm_kzalloc:
-	if (drvdata->config_type == TMC_CONFIG_TYPE_ETR)
-		dma_free_coherent(dev, drvdata->size,
-				drvdata->vaddr, drvdata->paddr);
 	return ret;
 }
 
diff --git a/kernel/events/core.c b/kernel/events/core.c
@@ -5818,7 +5818,7 @@ static int __perf_pmu_output_stop(void *info)
 {
 	struct perf_event *event = info;
 	struct pmu *pmu = event->pmu;
-	struct perf_cpu_context *cpuctx = get_cpu_ptr(pmu->pmu_cpu_context);
+	struct perf_cpu_context *cpuctx = this_cpu_ptr(pmu->pmu_cpu_context);
 	struct remote_output ro = {
 		.rb	= event->rb,
 	};

Original file line number	Diff line number	Diff line change
`@@ -388,9 +388,6 @@ static int tmc_probe(struct amba_device adev, const struct amba_id id)`
`388`	`388`	`err_misc_register:`
`389`	`389`	`coresight_unregister(drvdata->csdev);`
`390`	`390`	`err_devm_kzalloc:`
`391`		`- if (drvdata->config_type == TMC_CONFIG_TYPE_ETR)`
`392`		`- dma_free_coherent(dev, drvdata->size,`
`393`		`- drvdata->vaddr, drvdata->paddr);`
`394`	`391`	`return ret;`
`395`	`392`	`}`
`396`	`393`
Original file line number	Diff line number	Diff line change
`@@ -5818,7 +5818,7 @@ static int __perf_pmu_output_stop(void *info)`
`5818`	`5818`	`{`
`5819`	`5819`	`struct perf_event *event = info;`
`5820`	`5820`	`struct pmu *pmu = event->pmu;`
`5821`		`- struct perf_cpu_context *cpuctx = get_cpu_ptr(pmu->pmu_cpu_context);`
	`5821`	`+ struct perf_cpu_context *cpuctx = this_cpu_ptr(pmu->pmu_cpu_context);`
`5822`	`5822`	`struct remote_output ro = {`
`5823`	`5823`	`.rb = event->rb,`
`5824`	`5824`	`};`