[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 <haveblue@us.ibm.com>
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/ppc64/kernel/prom.c b/arch/ppc64/kernel/prom.c
index 1a4175811510d84e4f07af0cf2a6ea4caed5db34..bdf5e3a476dcb9d01ae619757bd495c7bb146e69 100644 (file)
--- 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;