From patchwork Mon Feb 8 17:07:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 8252601 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2532ABEEED for ; Mon, 8 Feb 2016 17:10:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3897A203DB for ; Mon, 8 Feb 2016 17:10:21 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EC13E203C3 for ; Mon, 8 Feb 2016 17:10:19 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aSpI4-0007Jt-9J; Mon, 08 Feb 2016 17:07:56 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aSpI3-0007Ht-05 for xen-devel@lists.xen.org; Mon, 08 Feb 2016 17:07:55 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 72/9D-21901-A6BC8B65; Mon, 08 Feb 2016 17:07:54 +0000 X-Env-Sender: prvs=839174cdf=Andrew.Cooper3@citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1454951271!21028580!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 47141 invoked from network); 8 Feb 2016 17:07:53 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-3.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 8 Feb 2016 17:07:53 -0000 X-IronPort-AV: E=Sophos;i="5.22,417,1449532800"; d="scan'208";a="330363114" From: Andrew Cooper To: Xen-devel Date: Mon, 8 Feb 2016 17:07:47 +0000 Message-ID: <1454951267-30034-3-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1454951267-30034-1-git-send-email-andrew.cooper3@citrix.com> References: <1454951267-30034-1-git-send-email-andrew.cooper3@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Andrew Cooper , Stefano Stabellini , Tim Deegan , Ian Campbell , Jan Beulich Subject: [Xen-devel] [PATCH 3/3] xen/init: Annotate all command line parameter infrastructure as const X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Jan Beulich --- CC: Jan Beulich CC: Tim Deegan CC: Ian Campbell CC: Stefano Stabellini --- 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; \