Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep...

[linux-2.6-block.git] / arch / powerpc / kernel / signal.c

diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c
index 3d7539b90010c6114655f3f909de64c65f09686a..61db86ecd318d8d7a027b28e6d8aebf19e06f528 100644 (file)
--- a/arch/powerpc/kernel/signal.c
+++ b/arch/powerpc/kernel/signal.c
@@ -153,6 +153,9 @@ void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags)
        if (thread_info_flags & _TIF_UPROBE)
                uprobe_notify_resume(regs);
 
+       if (thread_info_flags & _TIF_PATCH_PENDING)
+               klp_update_patch_state(current);
+
        if (thread_info_flags & _TIF_SIGPENDING) {
                BUG_ON(regs != current->thread.regs);
                do_signal(current);
@@ -163,9 +166,6 @@ void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags)
                tracehook_notify_resume(regs);
        }
 
-       if (thread_info_flags & _TIF_PATCH_PENDING)
-               klp_update_patch_state(current);
-
        user_enter();
 }