~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to arch/s390/include/asm/hugetlb.h

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
111
111
{
112
112
        pmd_t *pmdp = (pmd_t *) ptep;
113
113
 
114
 
        if (!MACHINE_HAS_IDTE) {
 
114
        if (MACHINE_HAS_IDTE)
 
115
                __pmd_idte(address, pmdp);
 
116
        else
115
117
                __pmd_csp(pmdp);
116
 
                if (mm->context.noexec) {
117
 
                        pmdp = get_shadow_table(pmdp);
118
 
                        __pmd_csp(pmdp);
119
 
                }
120
 
                return;
121
 
        }
122
 
 
123
 
        __pmd_idte(address, pmdp);
124
 
        if (mm->context.noexec) {
125
 
                pmdp = get_shadow_table(pmdp);
126
 
                __pmd_idte(address, pmdp);
127
 
        }
128
 
        return;
129
118
}
130
119
 
131
120
#define huge_ptep_set_access_flags(__vma, __addr, __ptep, __entry, __dirty) \