lkml.org 
[lkml]   [2012]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/17] ARM: mark const init data with __initconst instead of __initdata
    Date
    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: Andrew Victor <linux@maxim.org.za>
    Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
    Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
    Cc: Russell King <linux@arm.linux.org.uk>
    Cc: Sekhar Nori <nsekhar@ti.com>
    Cc: Kevin Hilman <khilman@ti.com>
    Cc: Kukjin Kim <kgene.kim@samsung.com>
    Cc: Sascha Hauer <kernel@pengutronix.de>
    Cc: Shawn Guo <shawn.guo@linaro.org>
    Cc: Lennert Buytenhek <kernel@wantstofly.org>
    Cc: Nicolas Pitre <nico@fluxnic.net>
    Cc: Eric Miao <eric.y.miao@gmail.com>
    Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
    Cc: David Brown <davidb@codeaurora.org>
    Cc: Daniel Walker <dwalker@fifo99.com>
    Cc: Bryan Huntsman <bryanh@codeaurora.org>
    Cc: Tony Lindgren <tony@atomide.com>
    Cc: Barry Song <baohua.song@csr.com>
    Cc: Andrew Lunn <andrew@lunn.ch>
    Cc: Lucas De Marchi <lucas.demarchi@profusion.mobi>
    Cc: linux-arm-kernel@lists.infradead.org
    Cc: davinci-linux-open-source@linux.davincidsp.com
    Cc: linux-samsung-soc@vger.kernel.org
    Cc: linux-arm-msm@vger.kernel.org
    Cc: linux-omap@vger.kernel.org
    ---
    arch/arm/mach-at91/board-dt.c | 2 +-
    arch/arm/mach-at91/clock.c | 2 +-
    arch/arm/mach-davinci/board-tnetv107x-evm.c | 6 ++--
    arch/arm/mach-davinci/da830.c | 48 ++++++++++++------------
    arch/arm/mach-davinci/da850.c | 6 ++--
    arch/arm/mach-dove/addr-map.c | 2 +-
    arch/arm/mach-exynos/mach-exynos4-dt.c | 2 +-
    arch/arm/mach-exynos/mach-exynos5-dt.c | 2 +-
    arch/arm/mach-imx/imx27-dt.c | 2 +-
    arch/arm/mach-imx/imx51-dt.c | 2 +-
    arch/arm/mach-imx/imx53-dt.c | 2 +-
    arch/arm/mach-imx/mach-imx6q.c | 2 +-
    arch/arm/mach-kirkwood/addr-map.c | 2 +-
    arch/arm/mach-mmp/mmp-dt.c | 2 +-
    arch/arm/mach-msm/board-msm8x60.c | 2 +-
    arch/arm/mach-msm/board-qsd8x50.c | 4 +-
    arch/arm/mach-omap2/board-generic.c | 8 ++--
    arch/arm/mach-omap2/display.c | 6 ++--
    arch/arm/mach-omap2/voltagedomains3xxx_data.c | 2 +-
    arch/arm/mach-omap2/voltagedomains44xx_data.c | 2 +-
    arch/arm/mach-orion5x/addr-map.c | 2 +-
    arch/arm/mach-prima2/prima2.c | 2 +-
    22 files changed, 55 insertions(+), 55 deletions(-)

    diff --git a/arch/arm/mach-at91/board-dt.c b/arch/arm/mach-at91/board-dt.c
    index c18d4d3..1c48ea2 100644
    --- a/arch/arm/mach-at91/board-dt.c
    +++ b/arch/arm/mach-at91/board-dt.c
    @@ -48,7 +48,7 @@ static void __init at91_dt_device_init(void)
    of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
    }

    -static const char *at91_dt_board_compat[] __initdata = {
    +static const char *at91_dt_board_compat[] __initconst = {
    "atmel,at91sam9m10g45ek",
    "atmel,at91sam9x5ek",
    "calao,usb-a9g20",
    diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c
    index a0f4d74..e4a255d 100644
    --- a/arch/arm/mach-at91/clock.c
    +++ b/arch/arm/mach-at91/clock.c
    @@ -613,7 +613,7 @@ fail:
    return 0;
    }

    -static struct clk *const standard_pmc_clocks[] __initdata = {
    +static struct clk *const standard_pmc_clocks[] __initconst = {
    /* four primary clocks */
    &clk32k,
    &main_clk,
    diff --git a/arch/arm/mach-davinci/board-tnetv107x-evm.c b/arch/arm/mach-davinci/board-tnetv107x-evm.c
    index 5f14e30..645a587 100644
    --- a/arch/arm/mach-davinci/board-tnetv107x-evm.c
    +++ b/arch/arm/mach-davinci/board-tnetv107x-evm.c
    @@ -88,7 +88,7 @@ static struct davinci_mmc_config mmc_config = {
    .version = MMC_CTLR_VERSION_1,
    };

    -static const short sdio1_pins[] __initdata = {
    +static const short sdio1_pins[] __initconst = {
    TNETV107X_SDIO1_CLK_1, TNETV107X_SDIO1_CMD_1,
    TNETV107X_SDIO1_DATA0_1, TNETV107X_SDIO1_DATA1_1,
    TNETV107X_SDIO1_DATA2_1, TNETV107X_SDIO1_DATA3_1,
    @@ -96,12 +96,12 @@ static const short sdio1_pins[] __initdata = {
    -1
    };

    -static const short uart1_pins[] __initdata = {
    +static const short uart1_pins[] __initconst = {
    TNETV107X_UART1_RD, TNETV107X_UART1_TD,
    -1
    };

    -static const short ssp_pins[] __initdata = {
    +static const short ssp_pins[] __initconst = {
    TNETV107X_SSP0_0, TNETV107X_SSP0_1, TNETV107X_SSP0_2,
    TNETV107X_SSP1_0, TNETV107X_SSP1_1, TNETV107X_SSP1_2,
    TNETV107X_SSP1_3, -1
    diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c
    index deee5c2..510648e 100644
    --- a/arch/arm/mach-davinci/da830.c
    +++ b/arch/arm/mach-davinci/da830.c
    @@ -838,7 +838,7 @@ static const struct mux_config da830_pins[] = {
    #endif
    };

    -const short da830_emif25_pins[] __initdata = {
    +const short da830_emif25_pins[] __initconst = {
    DA830_EMA_D_0, DA830_EMA_D_1, DA830_EMA_D_2, DA830_EMA_D_3,
    DA830_EMA_D_4, DA830_EMA_D_5, DA830_EMA_D_6, DA830_EMA_D_7,
    DA830_EMA_D_8, DA830_EMA_D_9, DA830_EMA_D_10, DA830_EMA_D_11,
    @@ -853,19 +853,19 @@ const short da830_emif25_pins[] __initdata = {
    -1
    };

    -const short da830_spi0_pins[] __initdata = {
    +const short da830_spi0_pins[] __initconst = {
    DA830_SPI0_SOMI_0, DA830_SPI0_SIMO_0, DA830_SPI0_CLK, DA830_NSPI0_ENA,
    DA830_NSPI0_SCS_0,
    -1
    };

    -const short da830_spi1_pins[] __initdata = {
    +const short da830_spi1_pins[] __initconst = {
    DA830_SPI1_SOMI_0, DA830_SPI1_SIMO_0, DA830_SPI1_CLK, DA830_NSPI1_ENA,
    DA830_NSPI1_SCS_0,
    -1
    };

    -const short da830_mmc_sd_pins[] __initdata = {
    +const short da830_mmc_sd_pins[] __initconst = {
    DA830_MMCSD_DAT_0, DA830_MMCSD_DAT_1, DA830_MMCSD_DAT_2,
    DA830_MMCSD_DAT_3, DA830_MMCSD_DAT_4, DA830_MMCSD_DAT_5,
    DA830_MMCSD_DAT_6, DA830_MMCSD_DAT_7, DA830_MMCSD_CLK,
    @@ -873,32 +873,32 @@ const short da830_mmc_sd_pins[] __initdata = {
    -1
    };

    -const short da830_uart0_pins[] __initdata = {
    +const short da830_uart0_pins[] __initconst = {
    DA830_NUART0_CTS, DA830_NUART0_RTS, DA830_UART0_RXD, DA830_UART0_TXD,
    -1
    };

    -const short da830_uart1_pins[] __initdata = {
    +const short da830_uart1_pins[] __initconst = {
    DA830_UART1_RXD, DA830_UART1_TXD,
    -1
    };

    -const short da830_uart2_pins[] __initdata = {
    +const short da830_uart2_pins[] __initconst = {
    DA830_UART2_RXD, DA830_UART2_TXD,
    -1
    };

    -const short da830_usb20_pins[] __initdata = {
    +const short da830_usb20_pins[] __initconst = {
    DA830_USB0_DRVVBUS, DA830_USB_REFCLKIN,
    -1
    };

    -const short da830_usb11_pins[] __initdata = {
    +const short da830_usb11_pins[] __initconst = {
    DA830_USB_REFCLKIN,
    -1
    };

    -const short da830_uhpi_pins[] __initdata = {
    +const short da830_uhpi_pins[] __initconst = {
    DA830_UHPI_HD_0, DA830_UHPI_HD_1, DA830_UHPI_HD_2, DA830_UHPI_HD_3,
    DA830_UHPI_HD_4, DA830_UHPI_HD_5, DA830_UHPI_HD_6, DA830_UHPI_HD_7,
    DA830_UHPI_HD_8, DA830_UHPI_HD_9, DA830_UHPI_HD_10, DA830_UHPI_HD_11,
    @@ -909,14 +909,14 @@ const short da830_uhpi_pins[] __initdata = {
    -1
    };

    -const short da830_cpgmac_pins[] __initdata = {
    +const short da830_cpgmac_pins[] __initconst = {
    DA830_RMII_TXD_0, DA830_RMII_TXD_1, DA830_RMII_TXEN, DA830_RMII_CRS_DV,
    DA830_RMII_RXD_0, DA830_RMII_RXD_1, DA830_RMII_RXER, DA830_MDIO_CLK,
    DA830_MDIO_D,
    -1
    };

    -const short da830_emif3c_pins[] __initdata = {
    +const short da830_emif3c_pins[] __initconst = {
    DA830_EMB_SDCKE, DA830_EMB_CLK_GLUE, DA830_EMB_CLK, DA830_NEMB_CS_0,
    DA830_NEMB_CAS, DA830_NEMB_RAS, DA830_NEMB_WE, DA830_EMB_BA_1,
    DA830_EMB_BA_0, DA830_EMB_A_0, DA830_EMB_A_1, DA830_EMB_A_2,
    @@ -935,7 +935,7 @@ const short da830_emif3c_pins[] __initdata = {
    -1
    };

    -const short da830_mcasp0_pins[] __initdata = {
    +const short da830_mcasp0_pins[] __initconst = {
    DA830_AHCLKX0, DA830_ACLKX0, DA830_AFSX0,
    DA830_AHCLKR0, DA830_ACLKR0, DA830_AFSR0, DA830_AMUTE0,
    DA830_AXR0_0, DA830_AXR0_1, DA830_AXR0_2, DA830_AXR0_3,
    @@ -945,7 +945,7 @@ const short da830_mcasp0_pins[] __initdata = {
    -1
    };

    -const short da830_mcasp1_pins[] __initdata = {
    +const short da830_mcasp1_pins[] __initconst = {
    DA830_AHCLKX1, DA830_ACLKX1, DA830_AFSX1,
    DA830_AHCLKR1, DA830_ACLKR1, DA830_AFSR1, DA830_AMUTE1,
    DA830_AXR1_0, DA830_AXR1_1, DA830_AXR1_2, DA830_AXR1_3,
    @@ -954,24 +954,24 @@ const short da830_mcasp1_pins[] __initdata = {
    -1
    };

    -const short da830_mcasp2_pins[] __initdata = {
    +const short da830_mcasp2_pins[] __initconst = {
    DA830_AHCLKX2, DA830_ACLKX2, DA830_AFSX2,
    DA830_AHCLKR2, DA830_ACLKR2, DA830_AFSR2, DA830_AMUTE2,
    DA830_AXR2_0, DA830_AXR2_1, DA830_AXR2_2, DA830_AXR2_3,
    -1
    };

    -const short da830_i2c0_pins[] __initdata = {
    +const short da830_i2c0_pins[] __initconst = {
    DA830_I2C0_SDA, DA830_I2C0_SCL,
    -1
    };

    -const short da830_i2c1_pins[] __initdata = {
    +const short da830_i2c1_pins[] __initconst = {
    DA830_I2C1_SCL, DA830_I2C1_SDA,
    -1
    };

    -const short da830_lcdcntl_pins[] __initdata = {
    +const short da830_lcdcntl_pins[] __initconst = {
    DA830_LCD_D_0, DA830_LCD_D_1, DA830_LCD_D_2, DA830_LCD_D_3,
    DA830_LCD_D_4, DA830_LCD_D_5, DA830_LCD_D_6, DA830_LCD_D_7,
    DA830_LCD_D_8, DA830_LCD_D_9, DA830_LCD_D_10, DA830_LCD_D_11,
    @@ -981,34 +981,34 @@ const short da830_lcdcntl_pins[] __initdata = {
    -1
    };

    -const short da830_pwm_pins[] __initdata = {
    +const short da830_pwm_pins[] __initconst = {
    DA830_ECAP0_APWM0, DA830_ECAP1_APWM1, DA830_EPWM0B, DA830_EPWM0A,
    DA830_EPWMSYNCI, DA830_EPWMSYNC0, DA830_ECAP2_APWM2, DA830_EHRPWMGLUETZ,
    DA830_EPWM2B, DA830_EPWM2A, DA830_EPWM1B, DA830_EPWM1A,
    -1
    };

    -const short da830_ecap0_pins[] __initdata = {
    +const short da830_ecap0_pins[] __initconst = {
    DA830_ECAP0_APWM0,
    -1
    };

    -const short da830_ecap1_pins[] __initdata = {
    +const short da830_ecap1_pins[] __initconst = {
    DA830_ECAP1_APWM1,
    -1
    };

    -const short da830_ecap2_pins[] __initdata = {
    +const short da830_ecap2_pins[] __initconst = {
    DA830_ECAP2_APWM2,
    -1
    };

    -const short da830_eqep0_pins[] __initdata = {
    +const short da830_eqep0_pins[] __initconst = {
    DA830_EQEP0I, DA830_EQEP0S, DA830_EQEP0A, DA830_EQEP0B,
    -1
    };

    -const short da830_eqep1_pins[] __initdata = {
    +const short da830_eqep1_pins[] __initconst = {
    DA830_EQEP1I, DA830_EQEP1S, DA830_EQEP1A, DA830_EQEP1B,
    -1
    };
    diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
    index b44dc84..6676dee 100644
    --- a/arch/arm/mach-davinci/da850.c
    +++ b/arch/arm/mach-davinci/da850.c
    @@ -576,17 +576,17 @@ static const struct mux_config da850_pins[] = {
    #endif
    };

    -const short da850_i2c0_pins[] __initdata = {
    +const short da850_i2c0_pins[] __initconst = {
    DA850_I2C0_SDA, DA850_I2C0_SCL,
    -1
    };

    -const short da850_i2c1_pins[] __initdata = {
    +const short da850_i2c1_pins[] __initconst = {
    DA850_I2C1_SCL, DA850_I2C1_SDA,
    -1
    };

    -const short da850_lcdcntl_pins[] __initdata = {
    +const short da850_lcdcntl_pins[] __initconst = {
    DA850_LCD_D_0, DA850_LCD_D_1, DA850_LCD_D_2, DA850_LCD_D_3,
    DA850_LCD_D_4, DA850_LCD_D_5, DA850_LCD_D_6, DA850_LCD_D_7,
    DA850_LCD_D_8, DA850_LCD_D_9, DA850_LCD_D_10, DA850_LCD_D_11,
    diff --git a/arch/arm/mach-dove/addr-map.c b/arch/arm/mach-dove/addr-map.c
    index 98b8c83b..93ea37d 100644
    --- a/arch/arm/mach-dove/addr-map.c
    +++ b/arch/arm/mach-dove/addr-map.c
    @@ -49,7 +49,7 @@ static struct __initdata orion_addr_map_cfg addr_map_cfg = {
    .bridge_virt_base = BRIDGE_VIRT_BASE,
    };

    -static const struct __initdata orion_addr_map_info addr_map_info[] = {
    +static const struct orion_addr_map_info addr_map_info[] __initconst = {
    /*
    * Windows for PCIe IO+MEM space.
    */
    diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c
    index 8245f1c..2b76302 100644
    --- a/arch/arm/mach-exynos/mach-exynos4-dt.c
    +++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
    @@ -72,7 +72,7 @@ static void __init exynos4210_dt_machine_init(void)
    exynos4210_auxdata_lookup, NULL);
    }

    -static char const *exynos4210_dt_compat[] __initdata = {
    +static char const *exynos4210_dt_compat[] __initconst = {
    "samsung,exynos4210",
    NULL
    };
    diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c
    index 0d26f50..9969dc1 100644
    --- a/arch/arm/mach-exynos/mach-exynos5-dt.c
    +++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
    @@ -61,7 +61,7 @@ static void __init exynos5250_dt_machine_init(void)
    exynos5250_auxdata_lookup, NULL);
    }

    -static char const *exynos5250_dt_compat[] __initdata = {
    +static char const *exynos5250_dt_compat[] __initconst = {
    "samsung,exynos5250",
    NULL
    };
    diff --git a/arch/arm/mach-imx/imx27-dt.c b/arch/arm/mach-imx/imx27-dt.c
    index 861ceb8..a797d68 100644
    --- a/arch/arm/mach-imx/imx27-dt.c
    +++ b/arch/arm/mach-imx/imx27-dt.c
    @@ -72,7 +72,7 @@ static struct sys_timer imx27_timer = {
    .init = imx27_timer_init,
    };

    -static const char *imx27_dt_board_compat[] __initdata = {
    +static const char *imx27_dt_board_compat[] __initconst = {
    "fsl,imx27",
    NULL
    };
    diff --git a/arch/arm/mach-imx/imx51-dt.c b/arch/arm/mach-imx/imx51-dt.c
    index 5cca573..7e00748 100644
    --- a/arch/arm/mach-imx/imx51-dt.c
    +++ b/arch/arm/mach-imx/imx51-dt.c
    @@ -102,7 +102,7 @@ static struct sys_timer imx51_timer = {
    .init = imx51_timer_init,
    };

    -static const char *imx51_dt_board_compat[] __initdata = {
    +static const char *imx51_dt_board_compat[] __initconst = {
    "fsl,imx51-babbage",
    "fsl,imx51",
    NULL
    diff --git a/arch/arm/mach-imx/imx53-dt.c b/arch/arm/mach-imx/imx53-dt.c
    index 4172279..0a02129 100644
    --- a/arch/arm/mach-imx/imx53-dt.c
    +++ b/arch/arm/mach-imx/imx53-dt.c
    @@ -109,7 +109,7 @@ static struct sys_timer imx53_timer = {
    .init = imx53_timer_init,
    };

    -static const char *imx53_dt_board_compat[] __initdata = {
    +static const char *imx53_dt_board_compat[] __initconst = {
    "fsl,imx53-ard",
    "fsl,imx53-evk",
    "fsl,imx53-qsb",
    diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
    index da6c1d9..59fd7de 100644
    --- a/arch/arm/mach-imx/mach-imx6q.c
    +++ b/arch/arm/mach-imx/mach-imx6q.c
    @@ -129,7 +129,7 @@ static struct sys_timer imx6q_timer = {
    .init = imx6q_timer_init,
    };

    -static const char *imx6q_dt_compat[] __initdata = {
    +static const char *imx6q_dt_compat[] __initconst = {
    "fsl,imx6q-arm2",
    "fsl,imx6q-sabrelite",
    "fsl,imx6q",
    diff --git a/arch/arm/mach-kirkwood/addr-map.c b/arch/arm/mach-kirkwood/addr-map.c
    index e9a7180..8ebb4ba 100644
    --- a/arch/arm/mach-kirkwood/addr-map.c
    +++ b/arch/arm/mach-kirkwood/addr-map.c
    @@ -44,7 +44,7 @@ static struct __initdata orion_addr_map_cfg addr_map_cfg = {
    .bridge_virt_base = BRIDGE_VIRT_BASE,
    };

    -static const struct __initdata orion_addr_map_info addr_map_info[] = {
    +static const struct __initconst orion_addr_map_info addr_map_info[] = {
    /*
    * Windows for PCIe IO+MEM space.
    */
    diff --git a/arch/arm/mach-mmp/mmp-dt.c b/arch/arm/mach-mmp/mmp-dt.c
    index 6707539..43755ec 100644
    --- a/arch/arm/mach-mmp/mmp-dt.c
    +++ b/arch/arm/mach-mmp/mmp-dt.c
    @@ -61,7 +61,7 @@ static void __init mmp_dt_init(void)
    mmp_auxdata_lookup, NULL);
    }

    -static const char *pxa168_dt_board_compat[] __initdata = {
    +static const char *pxa168_dt_board_compat[] __initconst = {
    "mrvl,pxa168-aspenite",
    NULL,
    };
    diff --git a/arch/arm/mach-msm/board-msm8x60.c b/arch/arm/mach-msm/board-msm8x60.c
    index 962e711..25597f5 100644
    --- a/arch/arm/mach-msm/board-msm8x60.c
    +++ b/arch/arm/mach-msm/board-msm8x60.c
    @@ -92,7 +92,7 @@ static void __init msm8x60_dt_init(void)
    msm_auxdata_lookup, NULL);
    }

    -static const char *msm8x60_fluid_match[] __initdata = {
    +static const char *msm8x60_fluid_match[] __initconst = {
    "qcom,msm8660-fluid",
    "qcom,msm8660-surf",
    NULL
    diff --git a/arch/arm/mach-msm/board-qsd8x50.c b/arch/arm/mach-msm/board-qsd8x50.c
    index 7e8909c..11de242 100644
    --- a/arch/arm/mach-msm/board-qsd8x50.c
    +++ b/arch/arm/mach-msm/board-qsd8x50.c
    @@ -39,8 +39,8 @@

    extern struct sys_timer msm_timer;

    -static const resource_size_t qsd8x50_surf_smc91x_base __initdata = 0x70000300;
    -static const unsigned qsd8x50_surf_smc91x_gpio __initdata = 156;
    +static const resource_size_t qsd8x50_surf_smc91x_base __initconst = 0x70000300;
    +static const unsigned qsd8x50_surf_smc91x_gpio __initconst = 156;

    /* Leave smc91x resources empty here, as we'll fill them in
    * at run-time: they vary from board to board, and the true
    diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
    index 74e1687..635dee4 100644
    --- a/arch/arm/mach-omap2/board-generic.c
    +++ b/arch/arm/mach-omap2/board-generic.c
    @@ -57,7 +57,7 @@ static void __init omap_generic_init(void)
    }

    #ifdef CONFIG_SOC_OMAP2420
    -static const char *omap242x_boards_compat[] __initdata = {
    +static const char *omap242x_boards_compat[] __initconst = {
    "ti,omap2420",
    NULL,
    };
    @@ -76,7 +76,7 @@ MACHINE_END
    #endif

    #ifdef CONFIG_SOC_OMAP2430
    -static const char *omap243x_boards_compat[] __initdata = {
    +static const char *omap243x_boards_compat[] __initconst = {
    "ti,omap2430",
    NULL,
    };
    @@ -111,7 +111,7 @@ static void __init omap3_init(void)
    omap_generic_init();
    }

    -static const char *omap3_boards_compat[] __initdata = {
    +static const char *omap3_boards_compat[] __initconst = {
    "ti,omap3",
    NULL,
    };
    @@ -146,7 +146,7 @@ static void __init omap4_init(void)
    omap_generic_init();
    }

    -static const char *omap4_boards_compat[] __initdata = {
    +static const char *omap4_boards_compat[] __initconst = {
    "ti,omap4",
    NULL,
    };
    diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
    index 9706c64..df2ef11 100644
    --- a/arch/arm/mach-omap2/display.c
    +++ b/arch/arm/mach-omap2/display.c
    @@ -74,14 +74,14 @@ struct omap_dss_hwmod_data {
    const int id;
    };

    -static const struct omap_dss_hwmod_data omap2_dss_hwmod_data[] __initdata = {
    +static const struct omap_dss_hwmod_data omap2_dss_hwmod_data[] __initconst = {
    { "dss_core", "omapdss_dss", -1 },
    { "dss_dispc", "omapdss_dispc", -1 },
    { "dss_rfbi", "omapdss_rfbi", -1 },
    { "dss_venc", "omapdss_venc", -1 },
    };

    -static const struct omap_dss_hwmod_data omap3_dss_hwmod_data[] __initdata = {
    +static const struct omap_dss_hwmod_data omap3_dss_hwmod_data[] __initconst = {
    { "dss_core", "omapdss_dss", -1 },
    { "dss_dispc", "omapdss_dispc", -1 },
    { "dss_rfbi", "omapdss_rfbi", -1 },
    @@ -89,7 +89,7 @@ static const struct omap_dss_hwmod_data omap3_dss_hwmod_data[] __initdata = {
    { "dss_dsi1", "omapdss_dsi", 0 },
    };

    -static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initdata = {
    +static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initconst = {
    { "dss_core", "omapdss_dss", -1 },
    { "dss_dispc", "omapdss_dispc", -1 },
    { "dss_rfbi", "omapdss_rfbi", -1 },
    diff --git a/arch/arm/mach-omap2/voltagedomains3xxx_data.c b/arch/arm/mach-omap2/voltagedomains3xxx_data.c
    index 57db203..0819a02 100644
    --- a/arch/arm/mach-omap2/voltagedomains3xxx_data.c
    +++ b/arch/arm/mach-omap2/voltagedomains3xxx_data.c
    @@ -96,7 +96,7 @@ static struct voltagedomain *voltagedomains_am35xx[] __initdata = {
    };


    -static const char *sys_clk_name __initdata = "sys_ck";
    +static const char *sys_clk_name __initconst = "sys_ck";

    void __init omap3xxx_voltagedomains_init(void)
    {
    diff --git a/arch/arm/mach-omap2/voltagedomains44xx_data.c b/arch/arm/mach-omap2/voltagedomains44xx_data.c
    index c3115f6..787ce89 100644
    --- a/arch/arm/mach-omap2/voltagedomains44xx_data.c
    +++ b/arch/arm/mach-omap2/voltagedomains44xx_data.c
    @@ -89,7 +89,7 @@ static struct voltagedomain *voltagedomains_omap4[] __initdata = {
    NULL,
    };

    -static const char *sys_clk_name __initdata = "sys_clkin_ck";
    +static const char *sys_clk_name __initconst = "sys_clkin_ck";

    void __init omap44xx_voltagedomains_init(void)
    {
    diff --git a/arch/arm/mach-orion5x/addr-map.c b/arch/arm/mach-orion5x/addr-map.c
    index 3638e5c..83a3d0b 100644
    --- a/arch/arm/mach-orion5x/addr-map.c
    +++ b/arch/arm/mach-orion5x/addr-map.c
    @@ -82,7 +82,7 @@ static struct __initdata orion_addr_map_cfg addr_map_cfg = {
    .bridge_virt_base = ORION5X_BRIDGE_VIRT_BASE,
    };

    -static const struct __initdata orion_addr_map_info addr_map_info[] = {
    +static const struct __initconst orion_addr_map_info addr_map_info[] = {
    /*
    * Setup windows for PCI+PCIe IO+MEM space.
    */
    diff --git a/arch/arm/mach-prima2/prima2.c b/arch/arm/mach-prima2/prima2.c
    index 02b9c05..978fa2f 100644
    --- a/arch/arm/mach-prima2/prima2.c
    +++ b/arch/arm/mach-prima2/prima2.c
    @@ -25,7 +25,7 @@ void __init sirfsoc_mach_init(void)
    of_platform_bus_probe(NULL, sirfsoc_of_bus_ids, NULL);
    }

    -static const char *prima2cb_dt_match[] __initdata = {
    +static const char *prima2cb_dt_match[] __initconst = {
    "sirf,prima2-cb",
    NULL
    };
    --
    1.7.9.1
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2012-03-29 23:17    [W:0.053 / U:140.888 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site