summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-08-10 22:17:19 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-08-10 22:46:56 +0100
commit5f6878b0d22f9b93f9698f88c335007e2a3c3bbc (patch)
treecb5ed8d029d8b0a1d499c4431527e97438d79804
parent8436b410806d9a9a8ebfa1b924d8a96da893561a (diff)
downloadop-kernel-dev-5f6878b0d22f9b93f9698f88c335007e2a3c3bbc.zip
op-kernel-dev-5f6878b0d22f9b93f9698f88c335007e2a3c3bbc.tar.gz
ARM: 6323/1: cam60: don't use __init for cam60_spi_{flash_platform_data,partitions}
From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 12/19] ARM: cam60: don't use __init for cam60_spi_{flash_platform_data,partitions} Date: Thu, 5 Aug 2010 16:08:46 +0200 Message-Id: <1281017333-5563-12-git-send-email-u.kleine-koenig@pengutronix.de> These two structs are referenced by cam60_spi_devices. The latter is copied at init time to kmalloced memory and so the copy isn't freed after booting. So it must not contain references to .init memory. This isn't noticed by modpost as cam60_spi_devices is in .init.data, too. Noticed-and-Acked-by: Andrew Victor <linux@maxim.org.za> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-at91/board-cam60.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/board-cam60.c b/arch/arm/mach-at91/board-cam60.c
index 05c7072..44eb9f7 100644
--- a/arch/arm/mach-at91/board-cam60.c
+++ b/arch/arm/mach-at91/board-cam60.c
@@ -75,7 +75,7 @@ static struct at91_usbh_data __initdata cam60_usbh_data = {
* SPI devices.
*/
#if defined(CONFIG_MTD_DATAFLASH)
-static struct mtd_partition __initdata cam60_spi_partitions[] = {
+static struct mtd_partition cam60_spi_partitions[] = {
{
.name = "BOOT1",
.offset = 0,
@@ -98,7 +98,7 @@ static struct mtd_partition __initdata cam60_spi_partitions[] = {
},
};
-static struct flash_platform_data cam60_spi_flash_platform_data __initdata = {
+static struct flash_platform_data cam60_spi_flash_platform_data = {
.name = "spi_flash",
.parts = cam60_spi_partitions,
.nr_parts = ARRAY_SIZE(cam60_spi_partitions)
OpenPOWER on IntegriCloud