Commit 1dbb920e authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: algapi - Move crypto_yield into internal.h 



This patch moves crypto_yield into internal.h as it's only used
by internal code such as skcipher.  It also adds a missing inclusion
of sched.h which is required for cond_resched.

The header files in internal.h have been cleaned up to remove some
ancient junk and add some more specific inclusions.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 9123e3a7

crypto/internal.h

+10 −6
Original line number Diff line number Diff line
@@ -10,16 +10,14 @@ 


#include <crypto/algapi.h>

#include <linux/completion.h>

#include <linux/mm.h>

#include <linux/highmem.h>

#include <linux/interrupt.h>

#include <linux/init.h>

#include <linux/list.h>

#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/notifier.h>

#include <linux/numa.h>

#include <linux/refcount.h>

#include <linux/rwsem.h>

#include <linux/slab.h>

#include <linux/sched.h>

#include <linux/types.h>



struct crypto_instance;

struct crypto_template;
@@ -140,5 +138,11 @@ static inline void crypto_notify(unsigned long val, void *v) 
	blocking_notifier_call_chain(&crypto_chain, val, v);

}



static inline void crypto_yield(u32 flags)

{

	if (flags & CRYPTO_TFM_REQ_MAY_SLEEP)

		cond_resched();

}



#endif	/* _CRYPTO_INTERNAL_H */

include/crypto/algapi.h

+0 −6
Original line number Diff line number Diff line
@@ -277,12 +277,6 @@ static inline int crypto_memneq(const void *a, const void *b, size_t size) 
	return __crypto_memneq(a, b, size) != 0UL ? 1 : 0;

}



static inline void crypto_yield(u32 flags)

{

	if (flags & CRYPTO_TFM_REQ_MAY_SLEEP)

		cond_resched();

}



int crypto_register_notifier(struct notifier_block *nb);

int crypto_unregister_notifier(struct notifier_block *nb);