lkml.org 
[lkml]   [2018]   [Apr]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH 45/45] C++: Move initcall_level_names[] to __initdata section
From
Date
Move initcall_level_names[] to __initdata section for the moment as g++
doesn't want to put it in __initconst:

init/main.c:876:20: error: 'initcall_level_names' causes a section type conflict with '__setup_str_set_debug_rodata'

Signed-off-by: David Howells <dhowells@redhat.com>
---

init/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init/main.c b/init/main.c
index 642e917387db..6d404fc07007 100644
--- a/init/main.c
+++ b/init/main.c
@@ -873,7 +873,7 @@ static initcall_t *initcall_levels[] __initdata = {
};

/* Keep these in sync with initcalls in include/linux/init.h */
-static const char *initcall_level_names[] __initconst = {
+static const char *initcall_level_names[] __initdata = {
"early",
"core",
"postcore",
\
 
 \ /
  Last update: 2018-04-01 22:45    [W:0.091 / U:18.236 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site