Commit 21493088733e6e09dac6f54595a1b6b8ab1e68fd
1 parent
0735ac1f25
Exists in
master
and in
4 other branches
crypto: padlock - Move padlock.h into include/crypto
This patch moves padlock.h from drivers/crypto into include/crypto so that it may be used by the via-rng driver. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Showing 4 changed files with 31 additions and 31 deletions Side-by-side Diff
drivers/crypto/padlock-aes.c
| ... | ... | @@ -9,6 +9,7 @@ |
| 9 | 9 | |
| 10 | 10 | #include <crypto/algapi.h> |
| 11 | 11 | #include <crypto/aes.h> |
| 12 | +#include <crypto/padlock.h> | |
| 12 | 13 | #include <linux/module.h> |
| 13 | 14 | #include <linux/init.h> |
| 14 | 15 | #include <linux/types.h> |
| ... | ... | @@ -21,7 +22,6 @@ |
| 21 | 22 | #include <asm/byteorder.h> |
| 22 | 23 | #include <asm/processor.h> |
| 23 | 24 | #include <asm/i387.h> |
| 24 | -#include "padlock.h" | |
| 25 | 25 | |
| 26 | 26 | /* |
| 27 | 27 | * Number of data blocks actually fetched for each xcrypt insn. |
drivers/crypto/padlock-sha.c
| ... | ... | @@ -13,6 +13,7 @@ |
| 13 | 13 | */ |
| 14 | 14 | |
| 15 | 15 | #include <crypto/internal/hash.h> |
| 16 | +#include <crypto/padlock.h> | |
| 16 | 17 | #include <crypto/sha.h> |
| 17 | 18 | #include <linux/err.h> |
| 18 | 19 | #include <linux/module.h> |
| ... | ... | @@ -22,13 +23,6 @@ |
| 22 | 23 | #include <linux/kernel.h> |
| 23 | 24 | #include <linux/scatterlist.h> |
| 24 | 25 | #include <asm/i387.h> |
| 25 | -#include "padlock.h" | |
| 26 | - | |
| 27 | -#ifdef CONFIG_64BIT | |
| 28 | -#define STACK_ALIGN 16 | |
| 29 | -#else | |
| 30 | -#define STACK_ALIGN 4 | |
| 31 | -#endif | |
| 32 | 26 | |
| 33 | 27 | struct padlock_sha_desc { |
| 34 | 28 | struct shash_desc fallback; |
drivers/crypto/padlock.h
| 1 | -/* | |
| 2 | - * Driver for VIA PadLock | |
| 3 | - * | |
| 4 | - * Copyright (c) 2004 Michal Ludvig <michal@logix.cz> | |
| 5 | - * | |
| 6 | - * This program is free software; you can redistribute it and/or modify it | |
| 7 | - * under the terms of the GNU General Public License as published by the Free | |
| 8 | - * Software Foundation; either version 2 of the License, or (at your option) | |
| 9 | - * any later version. | |
| 10 | - * | |
| 11 | - */ | |
| 12 | - | |
| 13 | -#ifndef _CRYPTO_PADLOCK_H | |
| 14 | -#define _CRYPTO_PADLOCK_H | |
| 15 | - | |
| 16 | -#define PADLOCK_ALIGNMENT 16 | |
| 17 | - | |
| 18 | -#define PFX "padlock: " | |
| 19 | - | |
| 20 | -#define PADLOCK_CRA_PRIORITY 300 | |
| 21 | -#define PADLOCK_COMPOSITE_PRIORITY 400 | |
| 22 | - | |
| 23 | -#endif /* _CRYPTO_PADLOCK_H */ |
include/crypto/padlock.h
| 1 | +/* | |
| 2 | + * Driver for VIA PadLock | |
| 3 | + * | |
| 4 | + * Copyright (c) 2004 Michal Ludvig <michal@logix.cz> | |
| 5 | + * | |
| 6 | + * This program is free software; you can redistribute it and/or modify it | |
| 7 | + * under the terms of the GNU General Public License as published by the Free | |
| 8 | + * Software Foundation; either version 2 of the License, or (at your option) | |
| 9 | + * any later version. | |
| 10 | + * | |
| 11 | + */ | |
| 12 | + | |
| 13 | +#ifndef _CRYPTO_PADLOCK_H | |
| 14 | +#define _CRYPTO_PADLOCK_H | |
| 15 | + | |
| 16 | +#define PADLOCK_ALIGNMENT 16 | |
| 17 | + | |
| 18 | +#define PFX KBUILD_MODNAME ": " | |
| 19 | + | |
| 20 | +#define PADLOCK_CRA_PRIORITY 300 | |
| 21 | +#define PADLOCK_COMPOSITE_PRIORITY 400 | |
| 22 | + | |
| 23 | +#ifdef CONFIG_64BIT | |
| 24 | +#define STACK_ALIGN 16 | |
| 25 | +#else | |
| 26 | +#define STACK_ALIGN 4 | |
| 27 | +#endif | |
| 28 | + | |
| 29 | +#endif /* _CRYPTO_PADLOCK_H */ |