Skip to content

Commit

Permalink
powerpc/ps3: Write highmem info to repository
Browse files Browse the repository at this point in the history
Add calls to the ps3_mm_set_repository_highmem() routine when the ps3
r1 highmem region is either created or destroyed.

Signed-off-by: Geoff Levand <geoff@infradead.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
  • Loading branch information
Geoff Levand authored and Michael Ellerman committed Jan 22, 2015
1 parent d4b18bd commit 5ae7463
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions arch/powerpc/platforms/ps3/mm.c
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,7 @@ static void ps3_mm_region_destroy(struct mem_region *r)
r->size = r->base = r->offset = 0;
map.total = map.rm.size;
}
ps3_mm_set_repository_highmem(NULL);
}

/*============================================================================*/
Expand Down Expand Up @@ -1218,8 +1219,12 @@ void __init ps3_mm_init(void)

/* Check if we got the highmem region from an earlier boot step */

if (ps3_mm_get_repository_highmem(&map.r1))
ps3_mm_region_create(&map.r1, map.total - map.rm.size);
if (ps3_mm_get_repository_highmem(&map.r1)) {
result = ps3_mm_region_create(&map.r1, map.total - map.rm.size);

if (!result)
ps3_mm_set_repository_highmem(&map.r1);
}

/* correct map.total for the real total amount of memory we use */
map.total = map.rm.size + map.r1.size;
Expand Down

0 comments on commit 5ae7463

Please sign in to comment.