From: "Jan Beulich" <JBeulich@suse.com>
To: xen-devel <xen-devel@lists.xenproject.org>
Cc: Stefano Stabellini <sstabellini@kernel.org>,
Wei Liu <wei.liu2@citrix.com>,
George Dunlap <George.Dunlap@eu.citrix.com>,
Andrew Cooper <andrew.cooper3@citrix.com>,
Ian Jackson <Ian.Jackson@eu.citrix.com>, Tim Deegan <tim@xen.org>
Subject: [PATCH] init: fix build with older gcc
Date: Fri, 24 Jun 2016 03:29:03 -0600 [thread overview]
Message-ID: <576D197F02000078000F8687@prv-mh.provo.novell.com> (raw)
In-Reply-To: <183f6c1e-7f32-0c53-d843-0a33a4e6485e@citrix.com>
[-- Attachment #1: Type: text/plain, Size: 926 bytes --]
__setup_str is used on arrays of char, so there aren't any relocatable
items. Hence __initconst has to be used here, not __initconstrel.
Whatever led to the revert of commit 59b151d2c0 (the original version
of a6066af5b1 "xen/init: Annotate all command line parameter
infrastructure as const" must have got addressed meanwhile - with the
patch here I can't see that old gcc (4.3ish) report a section type
conflict anymore.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/include/xen/init.h
+++ b/xen/include/xen/init.h
@@ -88,7 +88,7 @@ struct kernel_param {
extern const struct kernel_param __setup_start[], __setup_end[];
-#define __setup_str static const __initconstrel \
+#define __setup_str static const __initconst \
__attribute__((__aligned__(1))) char
#define __kparam static const __initsetup \
__attribute__((__aligned__(sizeof(void *)))) struct kernel_param
[-- Attachment #2: const-cmdline-infra-fix.patch --]
[-- Type: text/plain, Size: 954 bytes --]
init: fix build with older gcc
__setup_str is used on arrays of char, so there aren't any relocatable
items. Hence __initconst has to be used here, not __initconstrel.
Whatever led to the revert of commit 59b151d2c0 (the original version
of a6066af5b1 "xen/init: Annotate all command line parameter
infrastructure as const" must have got addressed meanwhile - with the
patch here I can't see that old gcc (4.3ish) report a section type
conflict anymore.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/include/xen/init.h
+++ b/xen/include/xen/init.h
@@ -88,7 +88,7 @@ struct kernel_param {
extern const struct kernel_param __setup_start[], __setup_end[];
-#define __setup_str static const __initconstrel \
+#define __setup_str static const __initconst \
__attribute__((__aligned__(1))) char
#define __kparam static const __initsetup \
__attribute__((__aligned__(sizeof(void *)))) struct kernel_param
[-- Attachment #3: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-06-24 9:29 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-21 16:59 [PATCH v2 1/4] xen/init: Annotate all command line parameter infrastructure as const Andrew Cooper
2016-06-21 16:59 ` [PATCH v2 2/4] arm/init: Move .init.proc.info into .init.data Andrew Cooper
2016-06-21 17:18 ` Konrad Rzeszutek Wilk
2016-06-23 11:44 ` Julien Grall
2016-06-21 16:59 ` [PATCH v2 3/4] xen/init: Move initcall infrastructure " Andrew Cooper
2016-06-21 17:19 ` Konrad Rzeszutek Wilk
2016-06-21 17:25 ` Andrew Cooper
2016-06-22 7:00 ` Jan Beulich
2016-06-23 10:12 ` [PATCH v3 " Andrew Cooper
2016-06-23 11:46 ` Julien Grall
2016-06-21 16:59 ` [PATCH v2 4/4] x86/boot: copy/clear sections more efficiently Andrew Cooper
2016-06-22 6:57 ` [PATCH v2 1/4] xen/init: Annotate all command line parameter infrastructure as const Jan Beulich
2016-06-23 11:42 ` Julien Grall
2016-06-23 16:00 ` Jan Beulich
2016-06-23 16:08 ` Andrew Cooper
2016-06-24 9:29 ` Jan Beulich [this message]
2016-06-24 9:32 ` [PATCH] init: fix build with older gcc Andrew Cooper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=576D197F02000078000F8687@prv-mh.provo.novell.com \
--to=jbeulich@suse.com \
--cc=George.Dunlap@eu.citrix.com \
--cc=Ian.Jackson@eu.citrix.com \
--cc=andrew.cooper3@citrix.com \
--cc=sstabellini@kernel.org \
--cc=tim@xen.org \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).