summaryrefslogtreecommitdiff
path: root/arch/frv/include/asm/page.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-04-13 09:57:03 +0300
committerIngo Molnar <mingo@kernel.org>2016-04-13 09:57:03 +0300
commit889fac6d67d46a5e781c08fb26fec9016db1c307 (patch)
tree7e01d04928f7ce343afff5b77ba13c2f3d083326 /arch/frv/include/asm/page.h
parentdad38ca64a252144b4ccdfe9730a3fe2b7c61957 (diff)
parentbf16200689118d19de1b8d2a3c314fc21f5dc7bb (diff)
downloadlinux-889fac6d67d46a5e781c08fb26fec9016db1c307.tar.xz
Merge tag 'v4.6-rc3' into perf/core, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/frv/include/asm/page.h')
-rw-r--r--arch/frv/include/asm/page.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/frv/include/asm/page.h b/arch/frv/include/asm/page.h
index 688d8076a43a..ec5eebce4fb3 100644
--- a/arch/frv/include/asm/page.h
+++ b/arch/frv/include/asm/page.h
@@ -8,9 +8,6 @@
#ifndef __ASSEMBLY__
-#define get_user_page(vaddr) __get_free_page(GFP_KERNEL)
-#define free_user_page(page, addr) free_page(addr)
-
#define clear_page(pgaddr) memset((pgaddr), 0, PAGE_SIZE)
#define copy_page(to,from) memcpy((to), (from), PAGE_SIZE)