From: Jan Beulich <jbeulich@suse.com>
Date: Mon, 22 Feb 2016 16:30:54 +0000 (+0100)
Subject: Revert "init: annotate all command line parameter infrastructure as const"
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~1699
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1a51423b5031ff88063c014dc33ca4bff39b5367;p=xen.git

Revert "init: annotate all command line parameter infrastructure as const"

This reverts commit 59b151d2c0bf37f3f2f984096d384dfdfa03a8f4,
as it breaks the build with older gcc.
---

diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S
index d22c263b80..f501a2fd01 100644
--- a/xen/arch/arm/xen.lds.S
+++ b/xen/arch/arm/xen.lds.S
@@ -115,12 +115,6 @@ SECTIONS
   .init.data : {
        *(.init.rodata)
        *(.init.rodata.str*)
-
-       . = ALIGN(8);
-       __setup_start = .;
-       *(.init.setup)
-       __setup_end = .;
-
        *(.init.data)
        *(.init.data.rel)
        *(.init.data.rel.*)
@@ -131,6 +125,11 @@ SECTIONS
        __ctors_end = .;
   } :text
   . = ALIGN(32);
+  .init.setup : {
+       __setup_start = .;
+       *(.init.setup)
+       __setup_end = .;
+  } :text
   .init.proc.info : {
        __proc_info_start = .;
        *(.init.proc.info)
diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S
index 0c9aefa3b3..9fde1dbffb 100644
--- a/xen/arch/x86/xen.lds.S
+++ b/xen/arch/x86/xen.lds.S
@@ -120,12 +120,6 @@ SECTIONS
   .init.data : {
        *(.init.rodata)
        *(.init.rodata.str*)
-
-       . = ALIGN(8);
-       __setup_start = .;
-       *(.init.setup)
-       __setup_end = .;
-
        *(.init.data)
        *(.init.data.rel)
        *(.init.data.rel.*)
@@ -152,6 +146,11 @@ SECTIONS
        __ctors_end = .;
   } :text
   . = ALIGN(32);
+  .init.setup : {
+       __setup_start = .;
+       *(.init.setup)
+       __setup_end = .;
+  } :text
   .initcall.init : {
        __initcall_start = .;
        *(.initcallpresmp.init)
diff --git a/xen/include/xen/init.h b/xen/include/xen/init.h
index 142c5c80f8..6081102556 100644
--- a/xen/include/xen/init.h
+++ b/xen/include/xen/init.h
@@ -87,8 +87,8 @@ struct kernel_param {
 
 extern struct kernel_param __setup_start, __setup_end;
 
-#define __setup_str static const __initconst __attribute__((__aligned__(1))) char
-#define __kparam static const __initsetup struct kernel_param
+#define __setup_str static __initdata __attribute__((__aligned__(1))) char
+#define __kparam static __initsetup struct kernel_param
 
 #define custom_param(_name, _var) \
     __setup_str __setup_str_##_var[] = _name; \