From: Andi Kleen <andi@firstfloor.org>
To: linux-kernel@vger.kernel.org
Cc: Andi Kleen <ak@linux.intel.com>, ralf@linux-mips.org
Subject: [PATCH 06/27] Initconst section fixes for MIPS
Date: Thu, 15 Sep 2011 13:09:33 -0700 [thread overview]
Message-ID: <1316117394-21666-7-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: ralf@linux-mips.org
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
arch/mips/bcm63xx/boards/board_bcm963xx.c | 2 +-
arch/mips/bcm63xx/dev-pcmcia.c | 2 +-
arch/mips/mti-malta/malta-setup.c | 2 +-
arch/mips/pci/fixup-mpc30x.c | 4 ++--
arch/mips/pci/pci-octeon.c | 2 +-
arch/mips/powertv/asic/asic-calliope.c | 2 +-
arch/mips/powertv/asic/asic-cronus.c | 2 +-
arch/mips/powertv/asic/asic-gaia.c | 2 +-
arch/mips/powertv/asic/asic-zeus.c | 2 +-
9 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c
index 40b223b..0d2b640 100644
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -591,7 +591,7 @@ static struct board_info __initdata board_DWVS0 = {
/*
* all boards
*/
-static const struct board_info __initdata *bcm963xx_boards[] = {
+static const struct board_info __initconst *bcm963xx_boards[] = {
#ifdef CONFIG_BCM63XX_CPU_6338
&board_96338gw,
&board_96338w,
diff --git a/arch/mips/bcm63xx/dev-pcmcia.c b/arch/mips/bcm63xx/dev-pcmcia.c
index de4d917..9b93880 100644
--- a/arch/mips/bcm63xx/dev-pcmcia.c
+++ b/arch/mips/bcm63xx/dev-pcmcia.c
@@ -79,7 +79,7 @@ static int __init config_pcmcia_cs(unsigned int cs,
return ret;
}
-static const __initdata struct {
+static const __initconst struct {
unsigned int cs;
unsigned int base;
unsigned int size;
diff --git a/arch/mips/mti-malta/malta-setup.c b/arch/mips/mti-malta/malta-setup.c
index b7f37d4..2e28f65 100644
--- a/arch/mips/mti-malta/malta-setup.c
+++ b/arch/mips/mti-malta/malta-setup.c
@@ -111,7 +111,7 @@ static void __init pci_clock_check(void)
unsigned int __iomem *jmpr_p =
(unsigned int *) ioremap(MALTA_JMPRS_REG, sizeof(unsigned int));
int jmpr = (__raw_readl(jmpr_p) >> 2) & 0x07;
- static const int pciclocks[] __initdata = {
+ static const int pciclocks[] __initconst = {
33, 20, 25, 30, 12, 16, 37, 10
};
int pciclock = pciclocks[jmpr];
diff --git a/arch/mips/pci/fixup-mpc30x.c b/arch/mips/pci/fixup-mpc30x.c
index e08f49c..8e4f828 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,
diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c
index ed1c542..0c71291 100644
--- a/arch/mips/pci/pci-octeon.c
+++ b/arch/mips/pci/pci-octeon.c
@@ -58,7 +58,7 @@ union octeon_pci_address {
} s;
};
-int __initdata (*octeon_pcibios_map_irq)(const struct pci_dev *dev,
+int __initconst (*octeon_pcibios_map_irq)(const struct pci_dev *dev,
u8 slot, u8 pin);
enum octeon_dma_bar_type octeon_dma_bar_type = OCTEON_DMA_BAR_TYPE_INVALID;
diff --git a/arch/mips/powertv/asic/asic-calliope.c b/arch/mips/powertv/asic/asic-calliope.c
index 0a170e0..7773f3d 100644
--- a/arch/mips/powertv/asic/asic-calliope.c
+++ b/arch/mips/powertv/asic/asic-calliope.c
@@ -28,7 +28,7 @@
#define CALLIOPE_ADDR(x) (CALLIOPE_IO_BASE + (x))
-const struct register_map calliope_register_map __initdata = {
+const struct register_map calliope_register_map __initconst = {
.eic_slow0_strt_add = {.phys = CALLIOPE_ADDR(0x800000)},
.eic_cfg_bits = {.phys = CALLIOPE_ADDR(0x800038)},
.eic_ready_status = {.phys = CALLIOPE_ADDR(0x80004c)},
diff --git a/arch/mips/powertv/asic/asic-cronus.c b/arch/mips/powertv/asic/asic-cronus.c
index bbc0c12..da076db 100644
--- a/arch/mips/powertv/asic/asic-cronus.c
+++ b/arch/mips/powertv/asic/asic-cronus.c
@@ -28,7 +28,7 @@
#define CRONUS_ADDR(x) (CRONUS_IO_BASE + (x))
-const struct register_map cronus_register_map __initdata = {
+const struct register_map cronus_register_map __initconst = {
.eic_slow0_strt_add = {.phys = CRONUS_ADDR(0x000000)},
.eic_cfg_bits = {.phys = CRONUS_ADDR(0x000038)},
.eic_ready_status = {.phys = CRONUS_ADDR(0x00004C)},
diff --git a/arch/mips/powertv/asic/asic-gaia.c b/arch/mips/powertv/asic/asic-gaia.c
index 91dda68..47683b3 100644
--- a/arch/mips/powertv/asic/asic-gaia.c
+++ b/arch/mips/powertv/asic/asic-gaia.c
@@ -23,7 +23,7 @@
#include <linux/init.h>
#include <asm/mach-powertv/asic.h>
-const struct register_map gaia_register_map __initdata = {
+const struct register_map gaia_register_map __initconst = {
.eic_slow0_strt_add = {.phys = GAIA_IO_BASE + 0x000000},
.eic_cfg_bits = {.phys = GAIA_IO_BASE + 0x000038},
.eic_ready_status = {.phys = GAIA_IO_BASE + 0x00004C},
diff --git a/arch/mips/powertv/asic/asic-zeus.c b/arch/mips/powertv/asic/asic-zeus.c
index 4a05bb0..6ff4b10 100644
--- a/arch/mips/powertv/asic/asic-zeus.c
+++ b/arch/mips/powertv/asic/asic-zeus.c
@@ -28,7 +28,7 @@
#define ZEUS_ADDR(x) (ZEUS_IO_BASE + (x))
-const struct register_map zeus_register_map __initdata = {
+const struct register_map zeus_register_map __initconst = {
.eic_slow0_strt_add = {.phys = ZEUS_ADDR(0x000000)},
.eic_cfg_bits = {.phys = ZEUS_ADDR(0x000038)},
.eic_ready_status = {.phys = ZEUS_ADDR(0x00004c)},
--
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 ` Andi Kleen [this message]
2011-09-22 16:59 ` [PATCH 06/27] Initconst section fixes for MIPS Ralf Baechle
2011-09-15 20:09 ` [PATCH 07/27] Initconst section fixes for POWERPC Andi Kleen
2011-09-15 20:45 ` 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-7-git-send-email-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=ak@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=ralf@linux-mips.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®