diff options
author | Cristian Stoica <cristian.stoica@nxp.com> | 2016-01-25 11:19:43 +0200 |
---|---|---|
committer | Zhenhua Luo <zhenhua.luo@nxp.com> | 2016-06-23 10:58:51 +0800 |
commit | 41d1478e1294d06f0cce58fe847c0b0f1706b808 (patch) | |
tree | 8c6c5e2887cc30435ee40e764bb2ede58278d0ac /recipes-kernel/cryptodev/sdk_patches/0017-remove-dead-code.patch | |
parent | e3956ffbc217e468e26c9ce2e8932d3720fabca4 (diff) | |
download | meta-fsl-ppc-41d1478e1294d06f0cce58fe847c0b0f1706b808.tar.gz |
cryptodev-qoriq: upgrade to 1.8 plus fsl patches
upstream commit: 87b56e04b24c6d4be145483477eff7d3153290e9
Also:
- move all fsl patches on top of cryptodev-1.8
- add CIOCHASH ioctl
- fix incorrect tests initializations
- modify yocto patches to match updated Makefiles
Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
Diffstat (limited to 'recipes-kernel/cryptodev/sdk_patches/0017-remove-dead-code.patch')
-rw-r--r-- | recipes-kernel/cryptodev/sdk_patches/0017-remove-dead-code.patch | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/recipes-kernel/cryptodev/sdk_patches/0017-remove-dead-code.patch b/recipes-kernel/cryptodev/sdk_patches/0017-remove-dead-code.patch new file mode 100644 index 0000000..07c389c --- /dev/null +++ b/recipes-kernel/cryptodev/sdk_patches/0017-remove-dead-code.patch | |||
@@ -0,0 +1,67 @@ | |||
1 | From 0ca641091b4113d73e75d30ef530c88836849308 Mon Sep 17 00:00:00 2001 | ||
2 | From: Tudor Ambarus <tudor.ambarus@freescale.com> | ||
3 | Date: Fri, 29 May 2015 15:28:47 +0300 | ||
4 | Subject: [PATCH 17/38] remove dead code | ||
5 | |||
6 | Functions kop_to_user and compat_kop_to_user are never used. Delete them | ||
7 | to avoid compiler warnings. | ||
8 | |||
9 | |||
10 | crypto/../../cryptodev-linux/ioctl.c:841:12: warning: 'kop_to_user' defined but not used [-Wunused-function] | ||
11 | static int kop_to_user(struct kernel_crypt_kop *kop, | ||
12 | ^ | ||
13 | crypto/../../cryptodev-linux/ioctl.c: At top level: | ||
14 | crypto/../../cryptodev-linux/ioctl.c:1195:12: warning: 'compat_kop_to_user' defined but not used [-Wunused-function] | ||
15 | static int compat_kop_to_user(struct kernel_crypt_kop *kop, void __user *arg) | ||
16 | ^ | ||
17 | Signed-off-by: Tudor Ambarus <tudor.ambarus@freescale.com> | ||
18 | Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com> | ||
19 | Change-Id: I6bd8a7eb6144224a20cd400813ab15a7a192dbb1 | ||
20 | Reviewed-on: http://git.am.freescale.net:8181/37440 | ||
21 | --- | ||
22 | ioctl.c | 22 ---------------------- | ||
23 | 1 file changed, 22 deletions(-) | ||
24 | |||
25 | diff --git a/ioctl.c b/ioctl.c | ||
26 | index 53dbf64..39635a4 100644 | ||
27 | --- a/ioctl.c | ||
28 | +++ b/ioctl.c | ||
29 | @@ -838,16 +838,6 @@ static int kop_from_user(struct kernel_crypt_kop *kop, | ||
30 | return fill_kop_from_cop(kop); | ||
31 | } | ||
32 | |||
33 | -static int kop_to_user(struct kernel_crypt_kop *kop, | ||
34 | - void __user *arg) | ||
35 | -{ | ||
36 | - if (unlikely(copy_to_user(arg, &kop->kop, sizeof(kop->kop)))) { | ||
37 | - dprintk(1, KERN_ERR, "Cannot copy to userspace\n"); | ||
38 | - return -EFAULT; | ||
39 | - } | ||
40 | - return 0; | ||
41 | -} | ||
42 | - | ||
43 | static int kcop_from_user(struct kernel_crypt_op *kcop, | ||
44 | struct fcrypt *fcr, void __user *arg) | ||
45 | { | ||
46 | @@ -1192,18 +1182,6 @@ static inline void crypt_kop_to_compat(struct crypt_kop *kop, | ||
47 | compat->curve_type = kop->curve_type; | ||
48 | } | ||
49 | |||
50 | -static int compat_kop_to_user(struct kernel_crypt_kop *kop, void __user *arg) | ||
51 | -{ | ||
52 | - struct compat_crypt_kop compat_kop; | ||
53 | - | ||
54 | - crypt_kop_to_compat(&kop->kop, &compat_kop); | ||
55 | - if (unlikely(copy_to_user(arg, &compat_kop, sizeof(compat_kop)))) { | ||
56 | - dprintk(1, KERN_ERR, "Cannot copy to userspace\n"); | ||
57 | - return -EFAULT; | ||
58 | - } | ||
59 | - return 0; | ||
60 | -} | ||
61 | - | ||
62 | static inline void | ||
63 | compat_to_session_op(struct compat_session_op *compat, struct session_op *sop) | ||
64 | { | ||
65 | -- | ||
66 | 2.7.0 | ||
67 | |||