From: Andi Kleen <andi@firstfloor.org>
To: linux-kernel@vger.kernel.org
Cc: Andi Kleen <ak@linux.intel.com>, benh@kernel.crashing.org
Subject: [PATCH 07/27] Initconst section fixes for POWERPC
Date: Thu, 15 Sep 2011 13:09:34 -0700 [thread overview]
Message-ID: <1316117394-21666-8-git-send-email-andi@firstfloor.org> (raw)
In-Reply-To: <1316117394-21666-1-git-send-email-andi@firstfloor.org>
From: Andi Kleen <ak@linux.intel.com>
Cc: benh@kernel.crashing.org
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
arch/powerpc/platforms/40x/ppc40x_simple.c | 2 +-
arch/powerpc/platforms/512x/mpc5121_generic.c | 2 +-
arch/powerpc/platforms/52xx/lite5200.c | 2 +-
arch/powerpc/platforms/52xx/media5200.c | 2 +-
arch/powerpc/platforms/52xx/mpc5200_simple.c | 2 +-
arch/powerpc/platforms/52xx/mpc52xx_pci.c | 2 +-
arch/powerpc/platforms/83xx/mpc830x_rdb.c | 2 +-
arch/powerpc/platforms/83xx/mpc831x_rdb.c | 2 +-
arch/powerpc/platforms/83xx/mpc837x_rdb.c | 2 +-
arch/powerpc/platforms/85xx/tqm85xx.c | 2 +-
arch/powerpc/platforms/cell/qpace_setup.c | 2 +-
arch/powerpc/platforms/cell/setup.c | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/arch/powerpc/platforms/40x/ppc40x_simple.c b/arch/powerpc/platforms/40x/ppc40x_simple.c
index e8dd5c5..d6ed100 100644
--- a/arch/powerpc/platforms/40x/ppc40x_simple.c
+++ b/arch/powerpc/platforms/40x/ppc40x_simple.c
@@ -50,7 +50,7 @@ machine_device_initcall(ppc40x_simple, ppc40x_device_probe);
* Again, if your board needs to do things differently then create a
* board.c file for it rather than adding it to this list.
*/
-static const char *board[] __initdata = {
+static const char * const board[] __initconst = {
"amcc,acadia",
"amcc,haleakala",
"amcc,kilauea",
diff --git a/arch/powerpc/platforms/512x/mpc5121_generic.c b/arch/powerpc/platforms/512x/mpc5121_generic.c
index 926731f..ca1ca66 100644
--- a/arch/powerpc/platforms/512x/mpc5121_generic.c
+++ b/arch/powerpc/platforms/512x/mpc5121_generic.c
@@ -26,7 +26,7 @@
/*
* list of supported boards
*/
-static const char *board[] __initdata = {
+static const char * const board[] __initconst = {
"prt,prtlvt",
NULL
};
diff --git a/arch/powerpc/platforms/52xx/lite5200.c b/arch/powerpc/platforms/52xx/lite5200.c
index 01ffa64..448d862 100644
--- a/arch/powerpc/platforms/52xx/lite5200.c
+++ b/arch/powerpc/platforms/52xx/lite5200.c
@@ -172,7 +172,7 @@ static void __init lite5200_setup_arch(void)
mpc52xx_setup_pci();
}
-static const char *board[] __initdata = {
+static const char * const board[] __initconst = {
"fsl,lite5200",
"fsl,lite5200b",
NULL,
diff --git a/arch/powerpc/platforms/52xx/media5200.c b/arch/powerpc/platforms/52xx/media5200.c
index 96f85e5..7a1a566 100644
--- a/arch/powerpc/platforms/52xx/media5200.c
+++ b/arch/powerpc/platforms/52xx/media5200.c
@@ -235,7 +235,7 @@ static void __init media5200_setup_arch(void)
}
/* list of the supported boards */
-static const char *board[] __initdata = {
+static const char * const board[] __initconst = {
"fsl,media5200",
NULL
};
diff --git a/arch/powerpc/platforms/52xx/mpc5200_simple.c b/arch/powerpc/platforms/52xx/mpc5200_simple.c
index e36d6e2..660cdde 100644
--- a/arch/powerpc/platforms/52xx/mpc5200_simple.c
+++ b/arch/powerpc/platforms/52xx/mpc5200_simple.c
@@ -49,7 +49,7 @@ static void __init mpc5200_simple_setup_arch(void)
}
/* list of the supported boards */
-static const char *board[] __initdata = {
+static const char * const board[] __initconst = {
"intercontrol,digsy-mtc",
"manroland,mucmc52",
"manroland,uc101",
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pci.c b/arch/powerpc/platforms/52xx/mpc52xx_pci.c
index bfb11e0..e2d401a 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pci.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pci.c
@@ -93,7 +93,7 @@ struct mpc52xx_pci {
};
/* MPC5200 device tree match tables */
-const struct of_device_id mpc52xx_pci_ids[] __initdata = {
+const struct of_device_id mpc52xx_pci_ids[] __initconst = {
{ .type = "pci", .compatible = "fsl,mpc5200-pci", },
{ .type = "pci", .compatible = "mpc5200-pci", },
{}
diff --git a/arch/powerpc/platforms/83xx/mpc830x_rdb.c b/arch/powerpc/platforms/83xx/mpc830x_rdb.c
index d0c4e15..7ef06d9 100644
--- a/arch/powerpc/platforms/83xx/mpc830x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc830x_rdb.c
@@ -57,7 +57,7 @@ static void __init mpc830x_rdb_init_IRQ(void)
ipic_set_default_priority();
}
-static const char *board[] __initdata = {
+static const char * const board[] __initconst = {
"MPC8308RDB",
"fsl,mpc8308rdb",
"denx,mpc8308_p1m",
diff --git a/arch/powerpc/platforms/83xx/mpc831x_rdb.c b/arch/powerpc/platforms/83xx/mpc831x_rdb.c
index f859ead..92c5f9d 100644
--- a/arch/powerpc/platforms/83xx/mpc831x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc831x_rdb.c
@@ -60,7 +60,7 @@ static void __init mpc831x_rdb_init_IRQ(void)
ipic_set_default_priority();
}
-static const char *board[] __initdata = {
+static const char * const board[] __initconst = {
"MPC8313ERDB",
"fsl,mpc8315erdb",
NULL
diff --git a/arch/powerpc/platforms/83xx/mpc837x_rdb.c b/arch/powerpc/platforms/83xx/mpc837x_rdb.c
index 7bafbf2..787cd23 100644
--- a/arch/powerpc/platforms/83xx/mpc837x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc837x_rdb.c
@@ -101,7 +101,7 @@ static void __init mpc837x_rdb_init_IRQ(void)
ipic_set_default_priority();
}
-static const char *board[] __initdata = {
+static const char * const board[] __initconst = {
"fsl,mpc8377rdb",
"fsl,mpc8378rdb",
"fsl,mpc8379rdb",
diff --git a/arch/powerpc/platforms/85xx/tqm85xx.c b/arch/powerpc/platforms/85xx/tqm85xx.c
index 325de77..63d41d5 100644
--- a/arch/powerpc/platforms/85xx/tqm85xx.c
+++ b/arch/powerpc/platforms/85xx/tqm85xx.c
@@ -187,7 +187,7 @@ static int __init declare_of_platform_devices(void)
}
machine_device_initcall(tqm85xx, declare_of_platform_devices);
-static const char *board[] __initdata = {
+static const char * const board[] __initconst = {
"tqc,tqm8540",
"tqc,tqm8541",
"tqc,tqm8548",
diff --git a/arch/powerpc/platforms/cell/qpace_setup.c b/arch/powerpc/platforms/cell/qpace_setup.c
index 51e2901..52354bc 100644
--- a/arch/powerpc/platforms/cell/qpace_setup.c
+++ b/arch/powerpc/platforms/cell/qpace_setup.c
@@ -60,7 +60,7 @@ static void qpace_progress(char *s, unsigned short hex)
printk("*** %04x : %s\n", hex, s ? s : "");
}
-static const struct of_device_id qpace_bus_ids[] __initdata = {
+static const struct of_device_id qpace_bus_ids[] __initconst = {
{ .type = "soc", },
{ .compatible = "soc", },
{ .type = "spider", },
diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c
index c73cf4c..9fd2c9b 100644
--- a/arch/powerpc/platforms/cell/setup.c
+++ b/arch/powerpc/platforms/cell/setup.c
@@ -139,7 +139,7 @@ static int __devinit cell_setup_phb(struct pci_controller *phb)
return 0;
}
-static const struct of_device_id cell_bus_ids[] __initdata = {
+static const struct of_device_id cell_bus_ids[] __initconst = {
{ .type = "soc", },
{ .compatible = "soc", },
{ .type = "spider", },
--
1.7.4.4
next prev parent reply other threads:[~2011-09-15 20:14 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-15 20:09 Tree sweep to fix up initconst Andi Kleen
2011-09-15 20:09 ` [PATCH 01/27] Initconst section fixes for ARM Andi Kleen
2011-09-15 20:09 ` [PATCH 02/27] Initconst section fixes for FRV Andi Kleen
2011-09-15 20:09 ` [PATCH 03/27] Initconst section fixes for H8300 Andi Kleen
2011-09-15 20:09 ` [PATCH 04/27] Initconst section fixes for IA64 Andi Kleen
2011-09-15 20:09 ` [PATCH 05/27] Initconst section fixes for M68K Andi Kleen
2011-10-31 18:05 ` Geert Uytterhoeven
2011-09-15 20:09 ` [PATCH 06/27] Initconst section fixes for MIPS Andi Kleen
2011-09-22 16:59 ` Ralf Baechle
2011-09-15 20:09 ` Andi Kleen [this message]
2011-09-15 20:45 ` [PATCH 07/27] Initconst section fixes for POWERPC Josh Boyer
2011-09-15 20:48 ` Andi Kleen
2011-09-15 20:56 ` Josh Boyer
2011-09-15 20:57 ` Andi Kleen
2011-09-15 23:04 ` Josh Boyer
2011-09-15 23:10 ` Andi Kleen
2011-09-15 23:26 ` Thomas Gleixner
2011-09-15 21:43 ` Jonathan Nieder
2011-09-15 20:09 ` [PATCH 08/27] Initconst section fixes for SH Andi Kleen
2011-09-15 20:09 ` [PATCH 09/27] Initconst section fixes for X86 Andi Kleen
2011-09-15 20:09 ` [PATCH 10/27] Initconst section fixes for CPUFREQ Andi Kleen
2011-09-15 21:43 ` Dave Jones
2011-09-15 20:09 ` [PATCH 11/27] Initconst section fixes for EDAC Andi Kleen
2011-09-15 20:09 ` [PATCH 12/27] Initconst section fixes for hwmon Andi Kleen
2011-09-15 20:09 ` [PATCH 13/27] Initconst section fixes for IDE Andi Kleen
2011-09-15 21:12 ` David Miller
2011-09-15 20:09 ` [PATCH 14/27] Initconst section fixes for macintosh Andi Kleen
2011-09-15 20:09 ` [PATCH 15/27] Initconst section fixes for media Andi Kleen
2011-09-15 20:09 ` [PATCH 16/27] Initconst section fixes for mfd Andi Kleen
2011-09-26 8:48 ` Samuel Ortiz
2011-09-15 20:09 ` [PATCH 17/27] Initconst section fixes for mmc Andi Kleen
2011-09-15 20:09 ` [PATCH 18/27] Initconst section fixes for mtd Andi Kleen
2011-09-15 20:09 ` [PATCH 19/27] Initconst section fixes for drivers/net Andi Kleen
2011-09-15 21:12 ` David Miller
2011-09-15 20:09 ` [PATCH 20/27] Initconst section fixes for SCSI Andi Kleen
2011-09-15 20:18 ` James Bottomley
2011-09-15 20:30 ` Andi Kleen
2011-09-15 20:09 ` [PATCH 21/27] Initconst section fixes for SPI Andi Kleen
2011-09-15 20:57 ` Grant Likely
2011-09-15 20:59 ` Andi Kleen
2011-09-15 20:09 ` [PATCH 22/27] Initconst section fixes for TTY Andi Kleen
2011-09-15 20:09 ` [PATCH 23/27] Initconst section fixes for VIDEO Andi Kleen
2011-09-15 20:09 ` [PATCH 24/27] Initconst section fixes for watchdog Andi Kleen
2011-09-15 20:09 ` [PATCH 25/27] Initconst section fixes for percpu Andi Kleen
2011-09-17 0:41 ` Tejun Heo
2011-09-15 20:09 ` [PATCH 26/27] Initconst section fixes for net Andi Kleen
2011-09-15 21:12 ` David Miller
2011-09-15 20:09 ` [PATCH 27/27] Initconst section fixes for lib Andi Kleen
2011-09-15 23:33 ` Tree sweep to fix up initconst Thomas Gleixner
2011-09-20 15:18 ` [PATCH 02/27] Initconst section fixes for FRV David Howells
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=1316117394-21666-8-git-send-email-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=ak@linux.intel.com \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.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
all inboxes | Powered by JetHome®