[PATCH] powerpc: fix two build warnings
Arnd Bergmann [Fri, 16 Dec 2005 21:45:27 +0000 (22:45 +0100)]
Building the arch/powerpc tree currently gives me
two warnings with gcc-4.0:

arch/powerpc/mm/imalloc.c: In function '__im_get_area':
arch/powerpc/mm/imalloc.c:225: warning: 'tmp' may be used uninitialized in this function
arch/powerpc/mm/hugetlbpage.c: In function 'hugetlb_get_unmapped_area':
arch/powerpc/mm/hugetlbpage.c:608: warning: unused variable 'vma'

both fixes are trivial.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>

arch/powerpc/mm/hugetlbpage.c
arch/powerpc/mm/imalloc.c

index f6fe3ea..b51bb28 100644 (file)
@@ -620,7 +620,6 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
 {
        int lastshift;
        u16 areamask, curareas;
-       struct vm_area_struct *vma;
 
        if (HPAGE_SHIFT == 0)
                return -EINVAL;
index f9587bc..8b0c132 100644 (file)
@@ -107,6 +107,7 @@ static int im_region_status(unsigned long v_addr, unsigned long size,
                if (v_addr < (unsigned long) tmp->addr + tmp->size)
                        break;
 
+       *vm = NULL;
        if (tmp) {
                if (im_region_overlaps(v_addr, size, tmp))
                        return IM_REGION_OVERLAP;
@@ -127,7 +128,6 @@ static int im_region_status(unsigned long v_addr, unsigned long size,
                }
        }
 
-       *vm = NULL;
        return IM_REGION_UNUSED;
 }