[CRYPTO] api: Kill crypto_km_types (70dec235) · Commits · 戴 / test

When scatterwalk is built as a module digest.c was broken because it requires the crypto_km_types structure which is in scatterwalk. This patch removes the crypto_km_types structure by encoding the logic into crypto_kmap_type directly. In fact, this even saves a few bytes of code (not to mention the data structure itself) on i386 which is about the only place where it's needed. Signed-off-by:

Herbert Xu <herbert@gondor.apana.org.au>

crypto/internal.h

+8 −3

Original line number	Diff line number	Diff line
		@@ -50,11 +50,16 @@ extern struct list_head crypto_alg_list;
		extern struct rw_semaphore crypto_alg_sem;
		extern struct blocking_notifier_head crypto_chain;

		extern enum km_type crypto_km_types[];

		static inline enum km_type crypto_kmap_type(int out)
		{
		return crypto_km_types[(in_softirq() ? 2 : 0) + out];
		enum km_type type;

		if (in_softirq())
		type = out * (KM_SOFTIRQ1 - KM_SOFTIRQ0) + KM_SOFTIRQ0;
		else
		type = out * (KM_USER1 - KM_USER0) + KM_USER0;

		return type;
		}

		static inline void crypto_kmap(struct page page, int out)

crypto/scatterwalk.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -23,14 +23,6 @@
		#include "internal.h"
		#include "scatterwalk.h"

		enum km_type crypto_km_types[] = {
		KM_USER0,
		KM_USER1,
		KM_SOFTIRQ0,
		KM_SOFTIRQ1,
		};
		EXPORT_SYMBOL_GPL(crypto_km_types);

		static inline void memcpy_dir(void buf, void sgdata, size_t nbytes, int out)
		{
		void *src = out ? buf : sgdata;

Admin message