[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen master] Revert "init: annotate all command line parameter infrastructure as const"
commit 1a51423b5031ff88063c014dc33ca4bff39b5367 Author: Jan Beulich <jbeulich@xxxxxxxx> AuthorDate: Mon Feb 22 17:30:54 2016 +0100 Commit: Jan Beulich <jbeulich@xxxxxxxx> CommitDate: Mon Feb 22 17:30:54 2016 +0100 Revert "init: annotate all command line parameter infrastructure as const" This reverts commit 59b151d2c0bf37f3f2f984096d384dfdfa03a8f4, as it breaks the build with older gcc. --- xen/arch/arm/xen.lds.S | 11 +++++------ xen/arch/x86/xen.lds.S | 11 +++++------ xen/include/xen/init.h | 4 ++-- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S index d22c263..f501a2f 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 0c9aefa..9fde1db 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 142c5c8..6081102 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; \ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |