From f9e684174739e90f3b3935fd621b272ca2f18672 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Fri, 7 May 2010 15:10:07 +0900 Subject: [PATCH] --- yaml --- r: 191703 b: refs/heads/master c: 36fa06d6b5ef1874d012c04b23d5b8982b1f8dea h: refs/heads/master i: 191701: 19dedce2aec638b03d6896393d4f9a7a56092ae3 191699: dffd37b7fc7ef33771cb18110364fc85f63c7ec0 191695: 9fde3a4c5387d8abd9afd0f0484a57599394d314 v: v3 --- [refs] | 2 +- trunk/arch/sh/kernel/setup.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 740a497f76a2..991a556a30ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5ec39507129a086d8838228ac1ca0a2eab38f91 +refs/heads/master: 36fa06d6b5ef1874d012c04b23d5b8982b1f8dea diff --git a/trunk/arch/sh/kernel/setup.c b/trunk/arch/sh/kernel/setup.c index d67a8a386907..08001729f5ee 100644 --- a/trunk/arch/sh/kernel/setup.c +++ b/trunk/arch/sh/kernel/setup.c @@ -192,7 +192,7 @@ static void __init check_for_initrd(void) initrd_start = (unsigned long)__va(__pa(start)); initrd_end = initrd_start + INITRD_SIZE; - reserve_bootmem(__pa(initrd_start), INITRD_SIZE, BOOTMEM_DEFAULT); + lmb_reserve(__pa(initrd_start), INITRD_SIZE); return;