Merge branch 'perf/urgent' into perf/core, to pick up fixes (4c4de7d3) · Commits · 戴 / test

Documentation/cpu-freq/index.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -32,8 +32,6 @@ cpufreq-stats.txt - General description of sysfs cpufreq stats.

		index.txt - File index, Mailing list and Links (this document)

		intel-pstate.txt - Intel pstate cpufreq driver specific file.

		pcc-cpufreq.txt - PCC cpufreq driver specific file.

+9 −7

Original line number	Diff line number	Diff line
		@@ -743,17 +743,19 @@ static int ghes_proc(struct ghes *ghes)
		}
		ghes_do_proc(ghes, ghes->estatus);

		out:
		ghes_clear_estatus(ghes);

		if (rc == -ENOENT)
		return rc;

		/*
		* GHESv2 type HEST entries introduce support for error acknowledgment,
		* so only acknowledge the error if this support is present.
		*/
		if (is_hest_type_generic_v2(ghes)) {
		rc = ghes_ack_error(ghes->generic_v2);
		if (rc)
		return rc;
		}
		out:
		ghes_clear_estatus(ghes);
		if (is_hest_type_generic_v2(ghes))
		return ghes_ack_error(ghes->generic_v2);

		return rc;
		}

+7 −0

Original line number	Diff line number	Diff line
		@@ -1581,6 +1581,9 @@ static int _opp_set_availability(struct device *dev, unsigned long freq,

		opp->available = availability_req;

		dev_pm_opp_get(opp);
		mutex_unlock(&opp_table->lock);

		/* Notify the change of the OPP availability */
		if (availability_req)
		blocking_notifier_call_chain(&opp_table->head, OPP_EVENT_ENABLE,
		@@ -1589,8 +1592,12 @@ static int _opp_set_availability(struct device *dev, unsigned long freq,
		blocking_notifier_call_chain(&opp_table->head,
		OPP_EVENT_DISABLE, opp);

		dev_pm_opp_put(opp);
		goto put_table;

		unlock:
		mutex_unlock(&opp_table->lock);
		put_table:
		dev_pm_opp_put_opp_table(opp_table);
		return r;
		}

+4 −0

Original line number	Diff line number	Diff line
		@@ -118,6 +118,10 @@ static const struct of_device_id blacklist[] __initconst = {

		{ .compatible = "sigma,tango4", },

		{ .compatible = "ti,am33xx", },
		{ .compatible = "ti,am43", },
		{ .compatible = "ti,dra7", },

		{ }
		};

+3 −1

Original line number	Diff line number	Diff line
		@@ -432,8 +432,10 @@ int ib_create_qp_security(struct ib_qp qp, struct ib_device dev)
		atomic_set(&qp->qp_sec->error_list_count, 0);
		init_completion(&qp->qp_sec->error_complete);
		ret = security_ib_alloc_security(&qp->qp_sec->security);
		if (ret)
		if (ret) {
		kfree(qp->qp_sec);
		qp->qp_sec = NULL;
		}

		return ret;
		}