diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-03-28 17:13:25 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-03-28 17:13:29 +1100 |
| commit | 657af6b501a2511fb6bebcca0de3e4c1685186b6 (patch) | |
| tree | 54c2adec1302650f5095950a2ef127298128a9d2 /arch/s390/mm | |
| parent | ae93185a4cc7a0a56d8b5fc2077548c1a0d3f677 (diff) | |
| parent | f684c699592229c3aebf656363bcb0cf86df2570 (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
fs/fs-writeback.c
Diffstat (limited to 'arch/s390/mm')
| -rw-r--r-- | arch/s390/mm/pgtable.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c index 796c9320c709..5d8324cd866b 100644 --- a/arch/s390/mm/pgtable.c +++ b/arch/s390/mm/pgtable.c @@ -505,6 +505,9 @@ static int gmap_connect_pgtable(unsigned long address, unsigned long segment, if (!pmd_present(*pmd) && __pte_alloc(mm, vma, pmd, vmaddr)) return -ENOMEM; + /* large pmds cannot yet be handled */ + if (pmd_large(*pmd)) + return -EFAULT; /* pmd now points to a valid segment table entry. */ rmap = kmalloc(sizeof(*rmap), GFP_KERNEL|__GFP_REPEAT); if (!rmap) |