diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2012-07-19 09:11:16 +0200 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2012-07-19 11:23:43 +0200 |
commit | 4a043d79dc2d082b0df28820d43b96f1cdaf29e7 (patch) | |
tree | eb19a5c0e9302b6eb5e698370db4b691f7a0764b /arch/mips/pci | |
parent | 5520e426901ccb3e6683132e5b70425a811d7f78 (diff) | |
download | linux-3.10-4a043d79dc2d082b0df28820d43b96f1cdaf29e7.tar.gz linux-3.10-4a043d79dc2d082b0df28820d43b96f1cdaf29e7.tar.bz2 linux-3.10-4a043d79dc2d082b0df28820d43b96f1cdaf29e7.zip |
mips: 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: linux-mips@linux-mips.org
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: kernel@pengutronix.de
Patchwork: https://patchwork.linux-mips.org/patch/3565/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/pci')
-rw-r--r-- | arch/mips/pci/fixup-mpc30x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/pci/fixup-mpc30x.c b/arch/mips/pci/fixup-mpc30x.c index e08f49cb687..8e4f8288eca 100644 --- a/arch/mips/pci/fixup-mpc30x.c +++ b/arch/mips/pci/fixup-mpc30x.c @@ -22,13 +22,13 @@ #include <asm/vr41xx/mpc30x.h> -static const int internal_func_irqs[] __initdata = { +static const int internal_func_irqs[] __initconst = { VRC4173_CASCADE_IRQ, VRC4173_AC97_IRQ, VRC4173_USB_IRQ, }; -static const int irq_tab_mpc30x[] __initdata = { +static const int irq_tab_mpc30x[] __initconst = { [12] = VRC4173_PCMCIA1_IRQ, [13] = VRC4173_PCMCIA2_IRQ, [29] = MQ200_IRQ, |