diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-21 09:36:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-21 09:36:46 -0700 |
| commit | c4ad180f0e2ef98de48179aec7afe004562c0ec5 (patch) | |
| tree | 150e920f530a4a12b56102e96fdf81ddf466cb68 /arch/s390/mm/pgtable.c | |
| parent | aa033810461ee56abbef6cef10aabd6b97f5caee (diff) | |
| parent | 6b8224e40af147d3300136ce6d037db48f89068f (diff) | |
| download | kernel_goldelico_gta04-c4ad180f0e2ef98de48179aec7afe004562c0ec5.zip kernel_goldelico_gta04-c4ad180f0e2ef98de48179aec7afe004562c0ec5.tar.gz kernel_goldelico_gta04-c4ad180f0e2ef98de48179aec7afe004562c0ec5.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 update from Martin Schwidefsky:
"An additional sysfs attribute for channel paths and a couple of bux
fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/pgtable: fix ipte notify bit
s390/xpram: mark xpram as non-rotational
s390/smp: fix cpu re-scan vs. cpu state
s390/cio: add channel ID sysfs attribute
s390/ftrace: fix mcount adjustment
s390: fix gmap_ipte_notifier vs. software dirty pages
s390: disable pfmf for clear page instruction
s390/disassembler: prevent endless loop in print_fn_code()
s390: remove non existent reference to GENERIC_KERNEL_THREAD
Diffstat (limited to 'arch/s390/mm/pgtable.c')
| -rw-r--r-- | arch/s390/mm/pgtable.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c index 7805ddc..18dc417 100644 --- a/arch/s390/mm/pgtable.c +++ b/arch/s390/mm/pgtable.c @@ -677,8 +677,7 @@ int gmap_ipte_notify(struct gmap *gmap, unsigned long start, unsigned long len) break; } /* Get the page mapped */ - if (get_user_pages(current, gmap->mm, addr, 1, 1, 0, - NULL, NULL) != 1) { + if (fixup_user_fault(current, gmap->mm, addr, FAULT_FLAG_WRITE)) { rc = -EFAULT; break; } |