summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c5dfdbe)
raw | patch | inline | side by side (parent: c5dfdbe)
author | Russell King <rmk+kernel@arm.linux.org.uk> | |
Wed, 29 Aug 2012 10:12:56 +0000 (11:12 +0100) | ||
committer | Russell King <rmk+kernel@arm.linux.org.uk> | |
Wed, 29 Aug 2012 10:13:03 +0000 (11:13 +0100) |
Use the provided function rather than re-coding this bit of code.
This also gets us protection against using these functions from
invalid contexts.
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Tested-by: Javier Martin <javier.martin@vista-silicon.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This also gets us protection against using these functions from
invalid contexts.
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Tested-by: Javier Martin <javier.martin@vista-silicon.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-imx/mach-imx27_visstrim_m10.c | patch | blob | history |
diff --git a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
index dff82eb57cd9f8957d1db67689ae5d58d7a4884c..8036ad8ab046989bd4fda4380290d73af7b5bf3d 100644 (file)
#include <linux/delay.h>
#include <linux/dma-mapping.h>
#include <linux/leds.h>
-#include <linux/memblock.h>
#include <media/soc_camera.h>
#include <sound/tlv320aic32x4.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
+#include <asm/memblock.h>
#include <asm/system.h>
#include <mach/common.h>
#include <mach/iomux-mx27.h>
static void __init visstrim_reserve(void)
{
/* reserve 4 MiB for mx2-camera */
- mx2_camera_base = memblock_alloc(MX2_CAMERA_BUF_SIZE,
+ mx2_camera_base = memblock_steal(MX2_CAMERA_BUF_SIZE,
MX2_CAMERA_BUF_SIZE);
- memblock_free(mx2_camera_base, MX2_CAMERA_BUF_SIZE);
- memblock_remove(mx2_camera_base, MX2_CAMERA_BUF_SIZE);
}
/* GPIOs used as events for applications */