mm: avoid uninitialized variable in tracepoint

[deliverable/linux.git] / mm / huge_memory.c

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index b2db98136af9d574646ef3f25d3cf1d462c174c1..b1cf73bc3b12969f00740031ac60f28840ac212d 100644 (file)
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1561,7 +1561,7 @@ int madvise_free_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma,
        int ret = 0;
 
        if (!pmd_trans_huge_lock(pmd, vma, &ptl))
-               goto out;
+               goto out_unlocked;
 
        orig_pmd = *pmd;
        if (is_huge_zero_pmd(orig_pmd)) {
@@ -2320,7 +2320,7 @@ static void collapse_huge_page(struct mm_struct *mm,
        pgtable_t pgtable;
        struct page *new_page;
        spinlock_t *pmd_ptl, *pte_ptl;
-       int isolated, result = 0;
+       int isolated = 0, result = 0;
        unsigned long hstart, hend;
        struct mem_cgroup *memcg;
        unsigned long mmun_start;       /* For mmu_notifiers */