summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2015-04-15 16:16:39 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-04-15 16:35:22 -0700
commitc79574abe2baddf569532e7e430e4977771dd25c (patch)
tree2b21044d2a11974bd64b27a4826d886c9440fe14 /lib
parent946e87981942552e526aca9cb6204f02a6c847cb (diff)
downloadlinux-c79574abe2baddf569532e7e430e4977771dd25c.tar.gz
linux-c79574abe2baddf569532e7e430e4977771dd25c.tar.bz2
linux-c79574abe2baddf569532e7e430e4977771dd25c.zip
lib/test-hexdump.c: fix initconst confusion
const char *...[] is not const, but an array of pointer to const. So these arrays cannot be __initconst, but must be __initdata This fixes section conflicts with LTO. Signed-off-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/test-hexdump.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/test-hexdump.c b/lib/test-hexdump.c
index daf29a390a89..9846ff7428b3 100644
--- a/lib/test-hexdump.c
+++ b/lib/test-hexdump.c
@@ -18,26 +18,26 @@ static const unsigned char data_b[] = {
static const unsigned char data_a[] = ".2.{....p..$}.4...1.....L...C...";
-static const char *test_data_1_le[] __initconst = {
+static const char * const test_data_1_le[] __initconst = {
"be", "32", "db", "7b", "0a", "18", "93", "b2",
"70", "ba", "c4", "24", "7d", "83", "34", "9b",
"a6", "9c", "31", "ad", "9c", "0f", "ac", "e9",
"4c", "d1", "19", "99", "43", "b1", "af", "0c",
};
-static const char *test_data_2_le[] __initconst = {
+static const char *test_data_2_le[] __initdata = {
"32be", "7bdb", "180a", "b293",
"ba70", "24c4", "837d", "9b34",
"9ca6", "ad31", "0f9c", "e9ac",
"d14c", "9919", "b143", "0caf",
};
-static const char *test_data_4_le[] __initconst = {
+static const char *test_data_4_le[] __initdata = {
"7bdb32be", "b293180a", "24c4ba70", "9b34837d",
"ad319ca6", "e9ac0f9c", "9919d14c", "0cafb143",
};
-static const char *test_data_8_le[] __initconst = {
+static const char *test_data_8_le[] __initdata = {
"b293180a7bdb32be", "9b34837d24c4ba70",
"e9ac0f9cad319ca6", "0cafb1439919d14c",
};