arm: tegra: remove setting of buddy_size in nvmap_platform_data
Vandana Salve [Tue, 3 Sep 2013 10:41:57 +0000 (15:41 +0530)]
Remove the initialization of buddy_size variable in the
struct nvmap_platform_data to remove usage of
buddy heap allocation

bug 898152

Change-Id: I3f94690fa0254650a2c7ac79d201d87e1f61181b
Signed-off-by: Vandana Salve <vsalve@nvidia.com>
Reviewed-on: http://git-master/r/269487
GVS: Gerrit_Virtual_Submit
Reviewed-by: Hiroshi Doyu <hdoyu@nvidia.com>

arch/arm/mach-tegra/board-ardbeg-panel.c
arch/arm/mach-tegra/board-dalmore-panel.c
arch/arm/mach-tegra/board-loki-panel.c
arch/arm/mach-tegra/board-pluto-panel.c

index 4b1452c..ccb3cfa 100644 (file)
@@ -377,21 +377,18 @@ static struct nvmap_platform_carveout ardbeg_carveouts[] = {
                .usage_mask     = NVMAP_HEAP_CARVEOUT_IRAM,
                .base           = TEGRA_IRAM_BASE + TEGRA_RESET_HANDLER_SIZE,
                .size           = TEGRA_IRAM_SIZE - TEGRA_RESET_HANDLER_SIZE,
-               .buddy_size     = 0, /* no buddy allocation for IRAM */
        },
        [1] = {
                .name           = "generic-0",
                .usage_mask     = NVMAP_HEAP_CARVEOUT_GENERIC,
                .base           = 0, /* Filled in by ardbeg_panel_init() */
                .size           = 0, /* Filled in by ardbeg_panel_init() */
-               .buddy_size     = SZ_32K,
        },
        [2] = {
                .name           = "vpr",
                .usage_mask     = NVMAP_HEAP_CARVEOUT_VPR,
                .base           = 0, /* Filled in by ardbeg_panel_init() */
                .size           = 0, /* Filled in by ardbeg_panel_init() */
-               .buddy_size     = SZ_32K,
        },
 };
 
index cf980d7..81d8490 100644 (file)
@@ -361,21 +361,18 @@ static struct nvmap_platform_carveout dalmore_carveouts[] = {
                .usage_mask     = NVMAP_HEAP_CARVEOUT_IRAM,
                .base           = TEGRA_IRAM_BASE + TEGRA_RESET_HANDLER_SIZE,
                .size           = TEGRA_IRAM_SIZE - TEGRA_RESET_HANDLER_SIZE,
-               .buddy_size     = 0, /* no buddy allocation for IRAM */
        },
        [1] = {
                .name           = "generic-0",
                .usage_mask     = NVMAP_HEAP_CARVEOUT_GENERIC,
                .base           = 0, /* Filled in by dalmore_panel_init() */
                .size           = 0, /* Filled in by dalmore_panel_init() */
-               .buddy_size     = SZ_32K,
        },
        [2] = {
                .name           = "vpr",
                .usage_mask     = NVMAP_HEAP_CARVEOUT_VPR,
                .base           = 0, /* Filled in by dalmore_panel_init() */
                .size           = 0, /* Filled in by dalmore_panel_init() */
-               .buddy_size     = SZ_32K,
        },
 };
 
index e09d05c..451917d 100644 (file)
@@ -856,21 +856,18 @@ static struct nvmap_platform_carveout loki_carveouts[] = {
                .usage_mask     = NVMAP_HEAP_CARVEOUT_IRAM,
                .base           = TEGRA_IRAM_BASE + TEGRA_RESET_HANDLER_SIZE,
                .size           = TEGRA_IRAM_SIZE - TEGRA_RESET_HANDLER_SIZE,
-               .buddy_size     = 0, /* no buddy allocation for IRAM */
        },
        [1] = {
                .name           = "generic-0",
                .usage_mask     = NVMAP_HEAP_CARVEOUT_GENERIC,
                .base           = 0, /* Filled in by loki_panel_init() */
                .size           = 0, /* Filled in by loki_panel_init() */
-               .buddy_size     = SZ_32K,
        },
        [2] = {
                .name           = "vpr",
                .usage_mask     = NVMAP_HEAP_CARVEOUT_VPR,
                .base           = 0, /* Filled in by loki_panel_init() */
                .size           = 0, /* Filled in by loki_panel_init() */
-               .buddy_size     = SZ_32K,
        },
 };
 
index 83fa4e5..2649108 100644 (file)
@@ -294,21 +294,18 @@ static struct nvmap_platform_carveout pluto_carveouts[] = {
                .usage_mask     = NVMAP_HEAP_CARVEOUT_IRAM,
                .base           = TEGRA_IRAM_BASE + TEGRA_RESET_HANDLER_SIZE,
                .size           = TEGRA_IRAM_SIZE - TEGRA_RESET_HANDLER_SIZE,
-               .buddy_size     = 0, /* no buddy allocation for IRAM */
        },
        [1] = {
                .name           = "generic-0",
                .usage_mask     = NVMAP_HEAP_CARVEOUT_GENERIC,
                .base           = 0, /* Filled in by pluto_panel_init() */
                .size           = 0, /* Filled in by pluto_panel_init() */
-               .buddy_size     = SZ_32K,
        },
        [2] = {
                .name           = "vpr",
                .usage_mask     = NVMAP_HEAP_CARVEOUT_VPR,
                .base           = 0, /* Filled in by pluto_panel_init() */
                .size           = 0, /* Filled in by pluto_panel_init() */
-               .buddy_size     = SZ_32K,
        },
 };