From: Mark Brown <broonie@linaro.org>
Date: Mon, 14 Jul 2014 09:45:20 +0000 (+0100)
Subject: Merge tag 'v3.10.48' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~36^2~46
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fa6e05294759c29b3736010aa386928d24715feb;p=firefly-linux-kernel-4.4.55.git

Merge tag 'v3.10.48' into linux-linaro-lsk

This is the 3.10.48 stable release
---

fa6e05294759c29b3736010aa386928d24715feb
diff --cc mm/hugetlb.c
index 070051379f46,dbc949c409c7..aa55badf57f7
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@@ -2366,39 -2408,12 +2407,13 @@@ int copy_hugetlb_page_range(struct mm_s
  		spin_unlock(&src->page_table_lock);
  		spin_unlock(&dst->page_table_lock);
  	}
 -	return 0;
  
 -nomem:
 -	return -ENOMEM;
 +	if (cow)
 +		mmu_notifier_invalidate_range_end(src, mmun_start, mmun_end);
 +
 +	return ret;
  }
  
- static int is_hugetlb_entry_migration(pte_t pte)
- {
- 	swp_entry_t swp;
- 
- 	if (huge_pte_none(pte) || pte_present(pte))
- 		return 0;
- 	swp = pte_to_swp_entry(pte);
- 	if (non_swap_entry(swp) && is_migration_entry(swp))
- 		return 1;
- 	else
- 		return 0;
- }
- 
- static int is_hugetlb_entry_hwpoisoned(pte_t pte)
- {
- 	swp_entry_t swp;
- 
- 	if (huge_pte_none(pte) || pte_present(pte))
- 		return 0;
- 	swp = pte_to_swp_entry(pte);
- 	if (non_swap_entry(swp) && is_hwpoison_entry(swp))
- 		return 1;
- 	else
- 		return 0;
- }
- 
  void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma,
  			    unsigned long start, unsigned long end,
  			    struct page *ref_page)