Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cc0ccd7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: hab: return -EINTR if woken up by a signal"

parents 46746922 333c319d

drivers/soc/qcom/hab/hab.c

+4 −3
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ void hab_ctx_free(struct kref *ref) 
	write_lock(&ctx->exp_lock);

	list_for_each_entry_safe(exp, exp_tmp, &ctx->exp_whse, node) {

		list_del(&exp->node);

		pr_err("potential leak exp %d vcid %X recovered\n",

		pr_debug("potential leak exp %d vcid %X recovered\n",

				exp->export_id, exp->vcid_local);

		habmem_hyp_revoke(exp->payload, exp->payload_count);

		habmem_remove_export(exp);
@@ -131,7 +131,7 @@ void hab_ctx_free(struct kref *ref) 
	list_for_each_entry_safe(exp, exp_tmp, &ctx->imp_whse, node) {

		list_del(&exp->node);

		ctx->import_total--;

		pr_warn("leaked imp %d vcid %X for ctx is collected total %d\n",

		pr_debug("leaked imp %d vcid %X for ctx is collected total %d\n",

			exp->export_id, exp->vcid_local,

			ctx->import_total);

		habmm_imp_hyp_unmap(ctx->import_ctx, exp, ctx->kernel);
@@ -329,6 +329,7 @@ struct virtual_channel *frontend_open(struct uhab_context *ctx, 
				   vchan->id);

		hab_open_pending_exit(ctx, pchan, &pending_open);



		if (ret != -EINTR)

			ret = -EINVAL;

		goto err;

	}

drivers/soc/qcom/hab/hab_open.c

+2 −2
Original line number Diff line number Diff line
@@ -165,8 +165,8 @@ int hab_open_listen(struct uhab_context *ctx, 
			pr_warn("local closing during open ret %d\n", ret);

			ret = -ENODEV;

		} else if (-ERESTARTSYS == ret) {

			pr_warn("local interrupted during open ret %d\n", ret);

			ret = -EAGAIN;

			pr_warn("local interrupted ret %d\n", ret);

			ret = -EINTR;

		}

	}