diff options
author | Andi Kleen <ak@linux.intel.com> | 2013-08-10 21:01:11 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2013-08-14 06:42:03 -0400 |
commit | f22d08111a1d23f7432ee8d9c2dd637deb6963bd (patch) | |
tree | f794dbdeb0be639588845fa505b40b1fd5d98b9f | |
parent | 3a4eac799b7b8afa00e621a88092a93dd4de2506 (diff) |
crypto: make tables used from assembler __visible
Tables used from assembler should be marked __visible to let
the compiler know.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r-- | arch/x86/crypto/camellia_glue.c | 16 | ||||
-rw-r--r-- | crypto/aes_generic.c | 8 | ||||
-rw-r--r-- | crypto/cast_common.c | 8 |
3 files changed, 16 insertions, 16 deletions
diff --git a/arch/x86/crypto/camellia_glue.c b/arch/x86/crypto/camellia_glue.c index 5cb86ccd4acb..fa4c1b9d9ea9 100644 --- a/arch/x86/crypto/camellia_glue.c +++ b/arch/x86/crypto/camellia_glue.c | |||
@@ -62,7 +62,7 @@ static void camellia_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src) | |||
62 | } | 62 | } |
63 | 63 | ||
64 | /* camellia sboxes */ | 64 | /* camellia sboxes */ |
65 | const u64 camellia_sp10011110[256] = { | 65 | __visible const u64 camellia_sp10011110[256] = { |
66 | 0x7000007070707000ULL, 0x8200008282828200ULL, 0x2c00002c2c2c2c00ULL, | 66 | 0x7000007070707000ULL, 0x8200008282828200ULL, 0x2c00002c2c2c2c00ULL, |
67 | 0xec0000ecececec00ULL, 0xb30000b3b3b3b300ULL, 0x2700002727272700ULL, | 67 | 0xec0000ecececec00ULL, 0xb30000b3b3b3b300ULL, 0x2700002727272700ULL, |
68 | 0xc00000c0c0c0c000ULL, 0xe50000e5e5e5e500ULL, 0xe40000e4e4e4e400ULL, | 68 | 0xc00000c0c0c0c000ULL, 0xe50000e5e5e5e500ULL, 0xe40000e4e4e4e400ULL, |
@@ -151,7 +151,7 @@ const u64 camellia_sp10011110[256] = { | |||
151 | 0x9e00009e9e9e9e00ULL, | 151 | 0x9e00009e9e9e9e00ULL, |
152 | }; | 152 | }; |
153 | 153 | ||
154 | const u64 camellia_sp22000222[256] = { | 154 | __visible const u64 camellia_sp22000222[256] = { |
155 | 0xe0e0000000e0e0e0ULL, 0x0505000000050505ULL, 0x5858000000585858ULL, | 155 | 0xe0e0000000e0e0e0ULL, 0x0505000000050505ULL, 0x5858000000585858ULL, |
156 | 0xd9d9000000d9d9d9ULL, 0x6767000000676767ULL, 0x4e4e0000004e4e4eULL, | 156 | 0xd9d9000000d9d9d9ULL, 0x6767000000676767ULL, 0x4e4e0000004e4e4eULL, |
157 | 0x8181000000818181ULL, 0xcbcb000000cbcbcbULL, 0xc9c9000000c9c9c9ULL, | 157 | 0x8181000000818181ULL, 0xcbcb000000cbcbcbULL, 0xc9c9000000c9c9c9ULL, |
@@ -240,7 +240,7 @@ const u64 camellia_sp22000222[256] = { | |||
240 | 0x3d3d0000003d3d3dULL, | 240 | 0x3d3d0000003d3d3dULL, |
241 | }; | 241 | }; |
242 | 242 | ||
243 | const u64 camellia_sp03303033[256] = { | 243 | __visible const u64 camellia_sp03303033[256] = { |
244 | 0x0038380038003838ULL, 0x0041410041004141ULL, 0x0016160016001616ULL, | 244 | 0x0038380038003838ULL, 0x0041410041004141ULL, 0x0016160016001616ULL, |
245 | 0x0076760076007676ULL, 0x00d9d900d900d9d9ULL, 0x0093930093009393ULL, | 245 | 0x0076760076007676ULL, 0x00d9d900d900d9d9ULL, 0x0093930093009393ULL, |
246 | 0x0060600060006060ULL, 0x00f2f200f200f2f2ULL, 0x0072720072007272ULL, | 246 | 0x0060600060006060ULL, 0x00f2f200f200f2f2ULL, 0x0072720072007272ULL, |
@@ -329,7 +329,7 @@ const u64 camellia_sp03303033[256] = { | |||
329 | 0x004f4f004f004f4fULL, | 329 | 0x004f4f004f004f4fULL, |
330 | }; | 330 | }; |
331 | 331 | ||
332 | const u64 camellia_sp00444404[256] = { | 332 | __visible const u64 camellia_sp00444404[256] = { |
333 | 0x0000707070700070ULL, 0x00002c2c2c2c002cULL, 0x0000b3b3b3b300b3ULL, | 333 | 0x0000707070700070ULL, 0x00002c2c2c2c002cULL, 0x0000b3b3b3b300b3ULL, |
334 | 0x0000c0c0c0c000c0ULL, 0x0000e4e4e4e400e4ULL, 0x0000575757570057ULL, | 334 | 0x0000c0c0c0c000c0ULL, 0x0000e4e4e4e400e4ULL, 0x0000575757570057ULL, |
335 | 0x0000eaeaeaea00eaULL, 0x0000aeaeaeae00aeULL, 0x0000232323230023ULL, | 335 | 0x0000eaeaeaea00eaULL, 0x0000aeaeaeae00aeULL, 0x0000232323230023ULL, |
@@ -418,7 +418,7 @@ const u64 camellia_sp00444404[256] = { | |||
418 | 0x00009e9e9e9e009eULL, | 418 | 0x00009e9e9e9e009eULL, |
419 | }; | 419 | }; |
420 | 420 | ||
421 | const u64 camellia_sp02220222[256] = { | 421 | __visible const u64 camellia_sp02220222[256] = { |
422 | 0x00e0e0e000e0e0e0ULL, 0x0005050500050505ULL, 0x0058585800585858ULL, | 422 | 0x00e0e0e000e0e0e0ULL, 0x0005050500050505ULL, 0x0058585800585858ULL, |
423 | 0x00d9d9d900d9d9d9ULL, 0x0067676700676767ULL, 0x004e4e4e004e4e4eULL, | 423 | 0x00d9d9d900d9d9d9ULL, 0x0067676700676767ULL, 0x004e4e4e004e4e4eULL, |
424 | 0x0081818100818181ULL, 0x00cbcbcb00cbcbcbULL, 0x00c9c9c900c9c9c9ULL, | 424 | 0x0081818100818181ULL, 0x00cbcbcb00cbcbcbULL, 0x00c9c9c900c9c9c9ULL, |
@@ -507,7 +507,7 @@ const u64 camellia_sp02220222[256] = { | |||
507 | 0x003d3d3d003d3d3dULL, | 507 | 0x003d3d3d003d3d3dULL, |
508 | }; | 508 | }; |
509 | 509 | ||
510 | const u64 camellia_sp30333033[256] = { | 510 | __visible const u64 camellia_sp30333033[256] = { |
511 | 0x3800383838003838ULL, 0x4100414141004141ULL, 0x1600161616001616ULL, | 511 | 0x3800383838003838ULL, 0x4100414141004141ULL, 0x1600161616001616ULL, |
512 | 0x7600767676007676ULL, 0xd900d9d9d900d9d9ULL, 0x9300939393009393ULL, | 512 | 0x7600767676007676ULL, 0xd900d9d9d900d9d9ULL, 0x9300939393009393ULL, |
513 | 0x6000606060006060ULL, 0xf200f2f2f200f2f2ULL, 0x7200727272007272ULL, | 513 | 0x6000606060006060ULL, 0xf200f2f2f200f2f2ULL, 0x7200727272007272ULL, |
@@ -596,7 +596,7 @@ const u64 camellia_sp30333033[256] = { | |||
596 | 0x4f004f4f4f004f4fULL, | 596 | 0x4f004f4f4f004f4fULL, |
597 | }; | 597 | }; |
598 | 598 | ||
599 | const u64 camellia_sp44044404[256] = { | 599 | __visible const u64 camellia_sp44044404[256] = { |
600 | 0x7070007070700070ULL, 0x2c2c002c2c2c002cULL, 0xb3b300b3b3b300b3ULL, | 600 | 0x7070007070700070ULL, 0x2c2c002c2c2c002cULL, 0xb3b300b3b3b300b3ULL, |
601 | 0xc0c000c0c0c000c0ULL, 0xe4e400e4e4e400e4ULL, 0x5757005757570057ULL, | 601 | 0xc0c000c0c0c000c0ULL, 0xe4e400e4e4e400e4ULL, 0x5757005757570057ULL, |
602 | 0xeaea00eaeaea00eaULL, 0xaeae00aeaeae00aeULL, 0x2323002323230023ULL, | 602 | 0xeaea00eaeaea00eaULL, 0xaeae00aeaeae00aeULL, 0x2323002323230023ULL, |
@@ -685,7 +685,7 @@ const u64 camellia_sp44044404[256] = { | |||
685 | 0x9e9e009e9e9e009eULL, | 685 | 0x9e9e009e9e9e009eULL, |
686 | }; | 686 | }; |
687 | 687 | ||
688 | const u64 camellia_sp11101110[256] = { | 688 | __visible const u64 camellia_sp11101110[256] = { |
689 | 0x7070700070707000ULL, 0x8282820082828200ULL, 0x2c2c2c002c2c2c00ULL, | 689 | 0x7070700070707000ULL, 0x8282820082828200ULL, 0x2c2c2c002c2c2c00ULL, |
690 | 0xececec00ececec00ULL, 0xb3b3b300b3b3b300ULL, 0x2727270027272700ULL, | 690 | 0xececec00ececec00ULL, 0xb3b3b300b3b3b300ULL, 0x2727270027272700ULL, |
691 | 0xc0c0c000c0c0c000ULL, 0xe5e5e500e5e5e500ULL, 0xe4e4e400e4e4e400ULL, | 691 | 0xc0c0c000c0c0c000ULL, 0xe5e5e500e5e5e500ULL, 0xe4e4e400e4e4e400ULL, |
diff --git a/crypto/aes_generic.c b/crypto/aes_generic.c index 47f2e5c71759..fd0d6b454975 100644 --- a/crypto/aes_generic.c +++ b/crypto/aes_generic.c | |||
@@ -62,7 +62,7 @@ static inline u8 byte(const u32 x, const unsigned n) | |||
62 | 62 | ||
63 | static const u32 rco_tab[10] = { 1, 2, 4, 8, 16, 32, 64, 128, 27, 54 }; | 63 | static const u32 rco_tab[10] = { 1, 2, 4, 8, 16, 32, 64, 128, 27, 54 }; |
64 | 64 | ||
65 | const u32 crypto_ft_tab[4][256] = { | 65 | __visible const u32 crypto_ft_tab[4][256] = { |
66 | { | 66 | { |
67 | 0xa56363c6, 0x847c7cf8, 0x997777ee, 0x8d7b7bf6, | 67 | 0xa56363c6, 0x847c7cf8, 0x997777ee, 0x8d7b7bf6, |
68 | 0x0df2f2ff, 0xbd6b6bd6, 0xb16f6fde, 0x54c5c591, | 68 | 0x0df2f2ff, 0xbd6b6bd6, 0xb16f6fde, 0x54c5c591, |
@@ -326,7 +326,7 @@ const u32 crypto_ft_tab[4][256] = { | |||
326 | } | 326 | } |
327 | }; | 327 | }; |
328 | 328 | ||
329 | const u32 crypto_fl_tab[4][256] = { | 329 | __visible const u32 crypto_fl_tab[4][256] = { |
330 | { | 330 | { |
331 | 0x00000063, 0x0000007c, 0x00000077, 0x0000007b, | 331 | 0x00000063, 0x0000007c, 0x00000077, 0x0000007b, |
332 | 0x000000f2, 0x0000006b, 0x0000006f, 0x000000c5, | 332 | 0x000000f2, 0x0000006b, 0x0000006f, 0x000000c5, |
@@ -590,7 +590,7 @@ const u32 crypto_fl_tab[4][256] = { | |||
590 | } | 590 | } |
591 | }; | 591 | }; |
592 | 592 | ||
593 | const u32 crypto_it_tab[4][256] = { | 593 | __visible const u32 crypto_it_tab[4][256] = { |
594 | { | 594 | { |
595 | 0x50a7f451, 0x5365417e, 0xc3a4171a, 0x965e273a, | 595 | 0x50a7f451, 0x5365417e, 0xc3a4171a, 0x965e273a, |
596 | 0xcb6bab3b, 0xf1459d1f, 0xab58faac, 0x9303e34b, | 596 | 0xcb6bab3b, 0xf1459d1f, 0xab58faac, 0x9303e34b, |
@@ -854,7 +854,7 @@ const u32 crypto_it_tab[4][256] = { | |||
854 | } | 854 | } |
855 | }; | 855 | }; |
856 | 856 | ||
857 | const u32 crypto_il_tab[4][256] = { | 857 | __visible const u32 crypto_il_tab[4][256] = { |
858 | { | 858 | { |
859 | 0x00000052, 0x00000009, 0x0000006a, 0x000000d5, | 859 | 0x00000052, 0x00000009, 0x0000006a, 0x000000d5, |
860 | 0x00000030, 0x00000036, 0x000000a5, 0x00000038, | 860 | 0x00000030, 0x00000036, 0x000000a5, 0x00000038, |
diff --git a/crypto/cast_common.c b/crypto/cast_common.c index a15f523d5f56..117dd8250f27 100644 --- a/crypto/cast_common.c +++ b/crypto/cast_common.c | |||
@@ -15,7 +15,7 @@ | |||
15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
16 | #include <crypto/cast_common.h> | 16 | #include <crypto/cast_common.h> |
17 | 17 | ||
18 | const u32 cast_s1[256] = { | 18 | __visible const u32 cast_s1[256] = { |
19 | 0x30fb40d4, 0x9fa0ff0b, 0x6beccd2f, 0x3f258c7a, 0x1e213f2f, | 19 | 0x30fb40d4, 0x9fa0ff0b, 0x6beccd2f, 0x3f258c7a, 0x1e213f2f, |
20 | 0x9c004dd3, 0x6003e540, 0xcf9fc949, | 20 | 0x9c004dd3, 0x6003e540, 0xcf9fc949, |
21 | 0xbfd4af27, 0x88bbbdb5, 0xe2034090, 0x98d09675, 0x6e63a0e0, | 21 | 0xbfd4af27, 0x88bbbdb5, 0xe2034090, 0x98d09675, 0x6e63a0e0, |
@@ -83,7 +83,7 @@ const u32 cast_s1[256] = { | |||
83 | }; | 83 | }; |
84 | EXPORT_SYMBOL_GPL(cast_s1); | 84 | EXPORT_SYMBOL_GPL(cast_s1); |
85 | 85 | ||
86 | const u32 cast_s2[256] = { | 86 | __visible const u32 cast_s2[256] = { |
87 | 0x1f201094, 0xef0ba75b, 0x69e3cf7e, 0x393f4380, 0xfe61cf7a, | 87 | 0x1f201094, 0xef0ba75b, 0x69e3cf7e, 0x393f4380, 0xfe61cf7a, |
88 | 0xeec5207a, 0x55889c94, 0x72fc0651, | 88 | 0xeec5207a, 0x55889c94, 0x72fc0651, |
89 | 0xada7ef79, 0x4e1d7235, 0xd55a63ce, 0xde0436ba, 0x99c430ef, | 89 | 0xada7ef79, 0x4e1d7235, 0xd55a63ce, 0xde0436ba, 0x99c430ef, |
@@ -151,7 +151,7 @@ const u32 cast_s2[256] = { | |||
151 | }; | 151 | }; |
152 | EXPORT_SYMBOL_GPL(cast_s2); | 152 | EXPORT_SYMBOL_GPL(cast_s2); |
153 | 153 | ||
154 | const u32 cast_s3[256] = { | 154 | __visible const u32 cast_s3[256] = { |
155 | 0x8defc240, 0x25fa5d9f, 0xeb903dbf, 0xe810c907, 0x47607fff, | 155 | 0x8defc240, 0x25fa5d9f, 0xeb903dbf, 0xe810c907, 0x47607fff, |
156 | 0x369fe44b, 0x8c1fc644, 0xaececa90, | 156 | 0x369fe44b, 0x8c1fc644, 0xaececa90, |
157 | 0xbeb1f9bf, 0xeefbcaea, 0xe8cf1950, 0x51df07ae, 0x920e8806, | 157 | 0xbeb1f9bf, 0xeefbcaea, 0xe8cf1950, 0x51df07ae, 0x920e8806, |
@@ -219,7 +219,7 @@ const u32 cast_s3[256] = { | |||
219 | }; | 219 | }; |
220 | EXPORT_SYMBOL_GPL(cast_s3); | 220 | EXPORT_SYMBOL_GPL(cast_s3); |
221 | 221 | ||
222 | const u32 cast_s4[256] = { | 222 | __visible const u32 cast_s4[256] = { |
223 | 0x9db30420, 0x1fb6e9de, 0xa7be7bef, 0xd273a298, 0x4a4f7bdb, | 223 | 0x9db30420, 0x1fb6e9de, 0xa7be7bef, 0xd273a298, 0x4a4f7bdb, |
224 | 0x64ad8c57, 0x85510443, 0xfa020ed1, | 224 | 0x64ad8c57, 0x85510443, 0xfa020ed1, |
225 | 0x7e287aff, 0xe60fb663, 0x095f35a1, 0x79ebf120, 0xfd059d43, | 225 | 0x7e287aff, 0xe60fb663, 0x095f35a1, 0x79ebf120, 0xfd059d43, |