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

Commit 0c27011a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  [CRYPTO] cryptd: Fix problem with cryptd and the freezer
parents ad360bbb 189fe317
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ static inline int cryptd_create_thread(struct cryptd_state *state,
	mutex_init(&state->mutex);
	crypto_init_queue(&state->queue, CRYPTD_MAX_QLEN);

	state->task = kthread_create(fn, state, name);
	state->task = kthread_run(fn, state, name);
	if (IS_ERR(state->task))
		return PTR_ERR(state->task);

@@ -316,6 +316,8 @@ static int cryptd_thread(void *data)
	struct cryptd_state *state = data;
	int stop;

	current->flags |= PF_NOFREEZE;

	do {
		struct crypto_async_request *req, *backlog;