← Back to branch summary

~ubuntu-branches/ubuntu/raring/linux-ti-omap4/raring-proposed

« back to all changes in this revision

Viewing changes to mm/hugetlb.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Ubuntu: 3.5.0-26.42
  • Date: 2013-03-14 15:21:40 UTC
  • mfrom: (76.1.1 quantal-proposed)
  • Revision ID: package-import@ubuntu.com-20130314152140-tl4mkjmxa038tm3h
Tags: 3.5.0-221.31
https://launchpad.net/bugs/1153648
https://launchpad.net/bugs/1152715
https://launchpad.net/bugs/1122094
https://launchpad.net/bugs/1147678
* Release Tracking Bug
  - LP: #1153648

[ Paolo Pisati ]

* rebased on Ubuntu-3.5.0-26.42

[ Ubuntu: 3.5.0-26.42 ]

* Release Tracking Bug
  - LP: #1152715
* ubuntu: overlayfs -- fix missmerge of vfs_open changes
  - LP: #1122094, #1147678

Show diffs side-by-side

added added

removed removed

Lines of Context:
mm/hugetlb.c
2972
2972
                if (!huge_pte_none(huge_ptep_get(ptep))) {
2973
2973
                        pte = huge_ptep_get_and_clear(mm, address, ptep);
2974
2974
                        pte = pte_mkhuge(pte_modify(pte, newprot));
 
2975
                        pte = arch_make_huge_pte(pte, vma, NULL, 0);
2975
2976
                        set_huge_pte_at(mm, address, ptep, pte);
2976
2977
                }
2977
2978
        }