summaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-10-20 10:16:46 +0200
committerIngo Molnar <mingo@kernel.org>2015-10-20 10:16:46 +0200
commita1a2ab2ff7040bdc9a31bfe7173913971f7d723b (patch)
treea5b448aaedafafca6974710b7d64074ed964fe24 /arch/sh
parent00eb4bab69db349c3bdc7e0b0f7e9070dafea58c (diff)
parent7379047d5585187d1288486d4627873170d0005a (diff)
downloadlinux-a1a2ab2ff7040bdc9a31bfe7173913971f7d723b.tar.bz2
Merge tag 'v4.3-rc6' into locking/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/include/asm/page.h1
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;