diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-16 11:42:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-16 11:42:37 -0700 |
| commit | 3d875182d7f4b27b7778c3ab6a39800d383968cb (patch) | |
| tree | 588a0f89219f4252d93a102b49f661b1bf435a84 /arch | |
| parent | Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux (diff) | |
| parent | sh: add copy_user_page() alias for __copy_user() (diff) | |
| download | linux-dev-3d875182d7f4b27b7778c3ab6a39800d383968cb.tar.xz linux-dev-3d875182d7f4b27b7778c3ab6a39800d383968cb.zip | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"6 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
sh: add copy_user_page() alias for __copy_user()
lib/Kconfig: ZLIB_DEFLATE must select BITREVERSE
mm, dax: fix DAX deadlocks
memcg: convert threshold to bytes
builddeb: remove debian/files before build
mm, fs: obey gfp_mapping for add_to_page_cache()
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sh/include/asm/page.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/include/asm/page.h b/arch/sh/include/asm/page.h index fe20d14ae051..ceb5201a30ed 100644 --- a/arch/sh/include/asm/page.h +++ b/arch/sh/include/asm/page.h @@ -59,6 +59,7 @@ pages_do_alias(unsigned long addr1, unsigned long addr2) #define clear_page(page) memset((void *)(page), 0, PAGE_SIZE) extern void copy_page(void *to, void *from); +#define copy_user_page(to, from, vaddr, pg) __copy_user(to, from, PAGE_SIZE) struct page; struct vm_area_struct; |