diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2012-03-30 06:05:00 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-04-02 00:00:03 -0400 |
commit | 059378e3ff36094dccdd55600c3ad67a88c302aa (patch) | |
tree | cf3de6bdf02df80408fe5db35d25a7e86b642d94 | |
parent | e31c6dfa8eb23ec7b3350b95ffe92f5a962d8c6b (diff) |
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: Uwe 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: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r-- | arch/powerpc/platforms/52xx/mpc52xx_pci.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/cell/qpace_setup.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/cell/setup.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pci.c b/arch/powerpc/platforms/52xx/mpc52xx_pci.c index bfb11e01133e..e2d401ad8fbb 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_pci.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_pci.c | |||
@@ -93,7 +93,7 @@ struct mpc52xx_pci { | |||
93 | }; | 93 | }; |
94 | 94 | ||
95 | /* MPC5200 device tree match tables */ | 95 | /* MPC5200 device tree match tables */ |
96 | const struct of_device_id mpc52xx_pci_ids[] __initdata = { | 96 | const struct of_device_id mpc52xx_pci_ids[] __initconst = { |
97 | { .type = "pci", .compatible = "fsl,mpc5200-pci", }, | 97 | { .type = "pci", .compatible = "fsl,mpc5200-pci", }, |
98 | { .type = "pci", .compatible = "mpc5200-pci", }, | 98 | { .type = "pci", .compatible = "mpc5200-pci", }, |
99 | {} | 99 | {} |
diff --git a/arch/powerpc/platforms/cell/qpace_setup.c b/arch/powerpc/platforms/cell/qpace_setup.c index 7f9b6742f8b6..6e3409d590ac 100644 --- a/arch/powerpc/platforms/cell/qpace_setup.c +++ b/arch/powerpc/platforms/cell/qpace_setup.c | |||
@@ -61,7 +61,7 @@ static void qpace_progress(char *s, unsigned short hex) | |||
61 | printk("*** %04x : %s\n", hex, s ? s : ""); | 61 | printk("*** %04x : %s\n", hex, s ? s : ""); |
62 | } | 62 | } |
63 | 63 | ||
64 | static const struct of_device_id qpace_bus_ids[] __initdata = { | 64 | static const struct of_device_id qpace_bus_ids[] __initconst = { |
65 | { .type = "soc", }, | 65 | { .type = "soc", }, |
66 | { .compatible = "soc", }, | 66 | { .compatible = "soc", }, |
67 | { .type = "spider", }, | 67 | { .type = "spider", }, |
diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c index fa3e294fd343..4ab087671185 100644 --- a/arch/powerpc/platforms/cell/setup.c +++ b/arch/powerpc/platforms/cell/setup.c | |||
@@ -140,7 +140,7 @@ static int __devinit cell_setup_phb(struct pci_controller *phb) | |||
140 | return 0; | 140 | return 0; |
141 | } | 141 | } |
142 | 142 | ||
143 | static const struct of_device_id cell_bus_ids[] __initdata = { | 143 | static const struct of_device_id cell_bus_ids[] __initconst = { |
144 | { .type = "soc", }, | 144 | { .type = "soc", }, |
145 | { .compatible = "soc", }, | 145 | { .compatible = "soc", }, |
146 | { .type = "spider", }, | 146 | { .type = "spider", }, |