Pull updates from Andrew Morton: "Most of -mm and quite a number of other subsystems: hotfixes, scripts, ocfs2, misc, lib, binfmt, init, reiserfs, exec, dma-mapping, kcov. MM is fairly quiet this time. Holidays, I assume" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (118 commits) kcov: ignore fault-inject and stacktrace include/linux/io-mapping.h-mapping: use PHYS_PFN() macro in io_mapping_map_atomic_wc() execve: warn if process starts with executable stack reiserfs: prevent NULL pointer dereference in reiserfs_insert_item() init/main.c: fix misleading "This architecture does not have kernel memory protection" message init/main.c: fix quoted value handling in unknown_bootoption init/main.c: remove unnecessary repair_env_string in do_initcall_level init/main.c: log arguments and environment passed to init fs/binfmt_elf.c: coredump: allow process with empty address space to coredump fs/binfmt_elf.c: coredump: delete duplicated overflow check fs/binfmt_elf.c: coredump: allocate core ELF header on stack fs/binfmt_elf.c: make BAD_ADDR() unlikely fs/binfmt_elf.c: better codegen around current->mm fs/binfmt_elf.c: don't copy ELF header around fs/binfmt_elf.c: fix ->start_code calculation fs/binfmt_elf.c: smaller code generation around auxv vector fill lib/find_bit.c: uninline helper _find_next_bit() lib/find_bit.c: join _find_next_bit{_le} uapi: rename ext2_swab() to swab() and share globally in swab.h lib/scatterlist.c: adjust indentation in __sg_alloc_table ...
Showing the changes to drivers/gpu (1 of 136 files). Show all
Unified · Split
| @@ -188,8 +188,8 @@ via_free_sg_info(struct pci_dev *pdev, drm_via_sg_info_t *vsg) · 187 unmodified lines | ||
| 188 | 188 | kfree(vsg->desc_pages); |
| 189 | 189 | /* fall through */ |
| 190 | 190 | case dr_via_pages_locked: |
| 191 | − put_user_pages_dirty_lock(vsg->pages, vsg->num_pages, | |
| 192 | − (vsg->direction == DMA_FROM_DEVICE)); | |
| 191 | + unpin_user_pages_dirty_lock(vsg->pages, vsg->num_pages, | |
| 192 | + (vsg->direction == DMA_FROM_DEVICE)); | |
| 193 | 193 | /* fall through */ |
| 194 | 194 | case dr_via_pages_alloc: |
| 195 | 195 | vfree(vsg->pages); |
| @@ -239,7 +239,7 @@ via_lock_all_dma_pages(drm_via_sg_info_t *vsg, drm_via_dmablit_t *xfer) · 43 unmodified lines | ||
| 239 | 239 | vsg->pages = vzalloc(array_size(sizeof(struct page *), vsg->num_pages)); |
| 240 | 240 | if (NULL == vsg->pages) |
| 241 | 241 | return -ENOMEM; |
| 242 | − ret = get_user_pages_fast((unsigned long)xfer->mem_addr, | |
| 242 | + ret = pin_user_pages_fast((unsigned long)xfer->mem_addr, | |
| 243 | 243 | vsg->num_pages, |
| 244 | 244 | vsg->direction == DMA_FROM_DEVICE ? FOLL_WRITE : 0, |
| 245 | 245 | vsg->pages); |