| Message ID | 1333055554-31300-15-git-send-email-u.kleine-koenig@pengutronix.de |
|---|---|
| State | Accepted |
| Commit | 6d56b9d65813dd6a184efc5e7955d7e181a853c0 |
| Headers | show |
On Thu, 2012-03-29 at 23:12 +0200, Uwe Kleine-König wrote: > 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 > Pushed to l2-mtd.git, thanks!
diff --git a/drivers/mtd/maps/wr_sbc82xx_flash.c b/drivers/mtd/maps/wr_sbc82xx_flash.c index aa7e0cb..4f6bf60 100644 --- a/drivers/mtd/maps/wr_sbc82xx_flash.c +++ b/drivers/mtd/maps/wr_sbc82xx_flash.c @@ -59,7 +59,7 @@ static struct mtd_partition bigflash_parts[] = { } }; -static const char *part_probes[] __initdata = {"cmdlinepart", "RedBoot", NULL}; +static const char *part_probes[] __initconst = {"cmdlinepart", "RedBoot", NULL}; #define init_sbc82xx_one_flash(map, br, or) \ do { \
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: David Woodhouse <dwmw2@infradead.org> Cc: linux-mtd@lists.infradead.org --- drivers/mtd/maps/wr_sbc82xx_flash.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)