Merge branch 'work.epoll' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[platform/kernel/linux-rpi.git] / arch / microblaze / kernel / signal.c

diff --git a/arch/microblaze/kernel/signal.c b/arch/microblaze/kernel/signal.c
index c9125c3..bdd6d0c 100644 (file)
--- a/arch/microblaze/kernel/signal.c
+++ b/arch/microblaze/kernel/signal.c
@@ -35,7 +35,6 @@
 #include <asm/entry.h>
 #include <asm/ucontext.h>
 #include <linux/uaccess.h>
-#include <asm/pgtable.h>
 #include <asm/pgalloc.h>
 #include <linux/syscalls.h>
 #include <asm/cacheflush.h>
@@ -160,9 +159,6 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
        int err = 0, sig = ksig->sig;
        unsigned long address = 0;
 #ifdef CONFIG_MMU
-       pgd_t *pgdp;
-       p4d_t *p4dp;
-       pud_t *pudp;
        pmd_t *pmdp;
        pte_t *ptep;
 #endif
@@ -198,10 +194,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
 
        address = ((unsigned long)frame->tramp);
 #ifdef CONFIG_MMU
-       pgdp = pgd_offset(current->mm, address);
-       p4dp = p4d_offset(pgdp, address);
-       pudp = pud_offset(p4dp, address);
-       pmdp = pmd_offset(pudp, address);
+       pmdp = pmd_off(current->mm, address);
 
        preempt_disable();
        ptep = pte_offset_map(pmdp, address);