Commit 059378e3 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Benjamin Herrenschmidt

powerpc: Mark const init data with __initconst instead of __initdata

As long as there is no other non-const variable marked __initdata in the
same compilation unit it doesn't hurt. If there were one however
compilation would fail with

	error: $variablename causes a section type conflict

because a section containing const variables is marked read only and so
cannot contain non-const variables.
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Josh Boyer <jwboyer@gmail.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linuxppc-dev@lists.ozlabs.org
Cc: cbe-oss-dev@lists.ozlabs.org
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent e31c6dfa
...@@ -93,7 +93,7 @@ struct mpc52xx_pci { ...@@ -93,7 +93,7 @@ struct mpc52xx_pci {
}; };
/* MPC5200 device tree match tables */ /* 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 = "fsl,mpc5200-pci", },
{ .type = "pci", .compatible = "mpc5200-pci", }, { .type = "pci", .compatible = "mpc5200-pci", },
{} {}
......
...@@ -61,7 +61,7 @@ static void qpace_progress(char *s, unsigned short hex) ...@@ -61,7 +61,7 @@ static void qpace_progress(char *s, unsigned short hex)
printk("*** %04x : %s\n", hex, s ? s : ""); 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", }, { .type = "soc", },
{ .compatible = "soc", }, { .compatible = "soc", },
{ .type = "spider", }, { .type = "spider", },
......
...@@ -140,7 +140,7 @@ static int __devinit cell_setup_phb(struct pci_controller *phb) ...@@ -140,7 +140,7 @@ static int __devinit cell_setup_phb(struct pci_controller *phb)
return 0; return 0;
} }
static const struct of_device_id cell_bus_ids[] __initdata = { static const struct of_device_id cell_bus_ids[] __initconst = {
{ .type = "soc", }, { .type = "soc", },
{ .compatible = "soc", }, { .compatible = "soc", },
{ .type = "spider", }, { .type = "spider", },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment