Received: by 10.213.65.68 with SMTP id h4csp1741780imn; Sun, 1 Apr 2018 13:44:11 -0700 (PDT) X-Google-Smtp-Source: AIpwx48TM3n660ttw6K3A1Eyc48P2umv1MyXM/O/qrI+ZULpwwLGf+/vriMelRHpFszwGP8bd/3t X-Received: by 2002:a17:902:2b84:: with SMTP id l4-v6mr7473091plb.65.1522615451118; Sun, 01 Apr 2018 13:44:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522615451; cv=none; d=google.com; s=arc-20160816; b=SBL577xXFYDSCIy1AoN6OLOfVIFQueA/+XOZwU9qHlZVMeOlromynL8QT79i2Z6lPa qEs9E0VBbfuzjJbdc20LeEYO2NM6OTBiWewA+K72x1ufKrSUfA70u3snw8BLEjjdeEV4 UGjXV9Pi+v4fSsfBj+J3A48JSl33w1xu/QbQVODINjMOHhWdCAo3yqLQOnmFL2x/zgE9 jhPIW9YJ451R773CuZyJIfeXko8kiNCLtblr5Vbdv+viwo9jprBEC6RHAsMp7N1aNREa OlIO1bxhmksIRWVbB+fG2JZUmHrF1Un9hgNPQADX5L8DmJMpU8klu5jCMEj0n4kAsmBo QuJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:to:from:subject :organization:arc-authentication-results; bh=Peip+XqXNEjU1Vp3FD+pqOOn57GxCbzfXkv5VDM2718=; b=w5n8KpTYdNyARJtIBtiFiKoyvjbcy2xMZ6UrBvCnnwgE0n7lxIyvbylo40Kiv6NacM KdrMRUhmlF9cR9DaQiifBgAOKO5vw4Xa7spIGAZTeZRZE1fMfAxaYyIrD0DgCoklbeA/ pxNRpP+yZ8S2Iq2pAoHoqqMnagzVlsB7wZzT+1+AersEBGOui3X7l8luALUOfH7x/p3Q 0fNFeGziU/za9ru1nBzCvBYi0JdclIpR2FA1yD6IvW+SrTRsItlPhSX4eSDuXUAdeI8H xO14a7C2nMadxpCLg90LDrXzHdeNsHwf4wKdCqWl2gPEJb5ddzv45xXy7lDOvxbabr3w AhxQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r4si8800895pgs.685.2018.04.01.13.43.57; Sun, 01 Apr 2018 13:44:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754377AbeDAUmU (ORCPT + 99 others); Sun, 1 Apr 2018 16:42:20 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:50636 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753931AbeDAUmR (ORCPT ); Sun, 1 Apr 2018 16:42:17 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AB6287705E for ; Sun, 1 Apr 2018 20:42:16 +0000 (UTC) Received: from warthog.procyon.org.uk (ovpn-120-59.rdu2.redhat.com [10.10.120.59]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5C94E111DCF0; Sun, 1 Apr 2018 20:42:16 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 Subject: [PATCH 20/45] C++: init/main: Constify pointers From: David Howells To: linux-kernel@vger.kernel.org Date: Sun, 01 Apr 2018 21:42:15 +0100 Message-ID: <152261533587.30503.7461802756178219198.stgit@warthog.procyon.org.uk> In-Reply-To: <152261521484.30503.16131389653845029164.stgit@warthog.procyon.org.uk> References: <152261521484.30503.16131389653845029164.stgit@warthog.procyon.org.uk> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Sun, 01 Apr 2018 20:42:16 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Sun, 01 Apr 2018 20:42:16 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'dhowells@redhat.com' RCPT:'' Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ramdisk_execute_command and initcall_level_names should be const char * pointers. Signed-off-by: David Howells --- init/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init/main.c b/init/main.c index 969eaf140ef0..642e917387db 100644 --- a/init/main.c +++ b/init/main.c @@ -135,7 +135,7 @@ static char *static_command_line; static char *initcall_command_line; static char *execute_command; -static char *ramdisk_execute_command; +static const char *ramdisk_execute_command; /* * Used to generate warnings if static_key manipulation functions are used @@ -873,7 +873,7 @@ static initcall_t *initcall_levels[] __initdata = { }; /* Keep these in sync with initcalls in include/linux/init.h */ -static char *initcall_level_names[] __initdata = { +static const char *initcall_level_names[] __initconst = { "early", "core", "postcore",