From 2f5998610ae315fa659ebe2ae0f1c02203b63d9a Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Fri, 7 Jan 2011 15:19:56 +0900 Subject: sh: Add a machvec callback for early memblock reservations. This adds in a callback to the machvec to allow platforms to do early reservations through memblock. Signed-off-by: Paul Mundt --- arch/sh/mm/init.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'arch/sh/mm') diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c index 3385b28acaa..0d3f912e333 100644 --- a/arch/sh/mm/init.c +++ b/arch/sh/mm/init.c @@ -2,7 +2,7 @@ * linux/arch/sh/mm/init.c * * Copyright (C) 1999 Niibe Yutaka - * Copyright (C) 2002 - 2010 Paul Mundt + * Copyright (C) 2002 - 2011 Paul Mundt * * Based on linux/arch/i386/mm/init.c: * Copyright (C) 1995 Linus Torvalds @@ -325,11 +325,17 @@ void __init paging_init(void) int nid; memblock_init(); - sh_mv.mv_mem_init(); early_reserve_mem(); + /* + * Once the early reservations are out of the way, give the + * platforms a chance to kick out some memory. + */ + if (sh_mv.mv_mem_reserve) + sh_mv.mv_mem_reserve(); + memblock_enforce_memory_limit(memory_limit); memblock_analyze(); -- cgit v1.2.3-70-g09d2