There is no reason for any of it to be modified. Additionally, link
.init.setup beside the other constant .init data.
No functional change.
Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com>
---
CC: Jan Beulich <jbeul...@suse.com>
CC: Tim Deegan <t...@xen.org>
CC: Ian Campbell <ian.campb...@citrix.com>
CC: Stefano Stabellini <stefano.stabell...@citrix.com>
---
xen/arch/arm/xen.lds.S | 11 ++++++-----
xen/arch/x86/xen.lds.S | 11 ++++++-----
xen/include/xen/init.h | 4 ++--
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S
index f501a2f..0e2c582 100644
--- a/xen/arch/arm/xen.lds.S
+++ b/xen/arch/arm/xen.lds.S
@@ -115,6 +115,12 @@ SECTIONS
.init.data : {
*(.init.rodata)
*(.init.rodata.str*)
+
+ . = ALIGN(32);
+ __setup_start = .;
+ *(.init.setup)
+ __setup_end = .;
+
*(.init.data)
*(.init.data.rel)
*(.init.data.rel.*)
@@ -125,11 +131,6 @@ 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 c1ce027..86905c8 100644
--- a/xen/arch/x86/xen.lds.S
+++ b/xen/arch/x86/xen.lds.S
@@ -120,6 +120,12 @@ SECTIONS
.init.data : {
*(.init.rodata)
*(.init.rodata.str*)
+
+ . = ALIGN(32);
+ __setup_start = .;
+ *(.init.setup)
+ __setup_end = .;
+
*(.init.data)
*(.init.data.rel)
*(.init.data.rel.*)
@@ -146,11 +152,6 @@ 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 6081102..142c5c8 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 __initdata __attribute__((__aligned__(1))) char
-#define __kparam static __initsetup struct kernel_param
+#define __setup_str static const __initconst __attribute__((__aligned__(1)))
char
+#define __kparam static const __initsetup struct kernel_param
#define custom_param(_name, _var) \
__setup_str __setup_str_##_var[] = _name; \
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
