From 85786b021a845c2c4715668601b6da5ac90072b5 Mon Sep 17 00:00:00 2001 From: Dave Hansen Date: Sun, 1 Aug 2004 20:09:48 -0700 Subject: [PATCH] [PATCH] ppc64: __make_room() warning fix arch/ppc64/kernel/prom.c: In function `__make_room': arch/ppc64/kernel/prom.c:1415: warning: unused variable `offset' Signed-off-by: Dave Hansen Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/ppc64/kernel/prom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/ppc64/kernel/prom.c b/arch/ppc64/kernel/prom.c index 1a4175811510d..bdf5e3a476dcb 100644 --- a/arch/ppc64/kernel/prom.c +++ b/arch/ppc64/kernel/prom.c @@ -1412,11 +1412,11 @@ static void __init *__make_room(unsigned long *mem_start, unsigned long *mem_end unsigned long needed, unsigned long align) { void *ret; - unsigned long offset = reloc_offset(); *mem_start = ALIGN(*mem_start, align); if (*mem_start + needed > *mem_end) { #ifdef CONFIG_BLK_DEV_INITRD + unsigned long offset = reloc_offset(); /* FIXME: Apple OF doesn't map unclaimed mem. If this * ever happened on G5, we'd need to fix. */ unsigned long initrd_len; -- 2.53.0