Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream

1 files changed, 0 insertions, 12 deletions

diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index c930ac38e59f..7b816daf3eba 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -554,18 +554,6 @@ void exit_thread(void)
 
 void flush_thread(void)
 {
-#ifdef CONFIG_PPC64
-        struct thread_info *t = current_thread_info();
-
-        if (test_ti_thread_flag(t, TIF_ABI_PENDING)) {
-                clear_ti_thread_flag(t, TIF_ABI_PENDING);
-                if (test_ti_thread_flag(t, TIF_32BIT))
-                        clear_ti_thread_flag(t, TIF_32BIT);
-                else
-                        set_ti_thread_flag(t, TIF_32BIT);
-        }
-#endif
-
         discard_lazy_cpu_state();
 
         if (current->thread.dabr) {