diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 07:48:51 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 07:48:51 -0500 |
| commit | f11cbd74c5ff3614f6390b4de67a6ffdc614c378 (patch) | |
| tree | 6a30920ade9eeaac5bf6d6263b5d09712e882eb0 /arch/powerpc/kernel/process.c | |
| parent | 429c42c9d246f5bda868495c09974312a0177328 (diff) | |
| parent | aea187c46f7d03ce985e55eb1398d0776a15b928 (diff) | |
Merge branch 'master' into for-2.6.34
Diffstat (limited to 'arch/powerpc/kernel/process.c')
| -rw-r--r-- | arch/powerpc/kernel/process.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index c930ac38e59..7b816daf3eb 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c | |||
| @@ -554,18 +554,6 @@ void exit_thread(void) | |||
| 554 | 554 | ||
| 555 | void flush_thread(void) | 555 | void flush_thread(void) |
| 556 | { | 556 | { |
| 557 | #ifdef CONFIG_PPC64 | ||
| 558 | struct thread_info *t = current_thread_info(); | ||
| 559 | |||
| 560 | if (test_ti_thread_flag(t, TIF_ABI_PENDING)) { | ||
| 561 | clear_ti_thread_flag(t, TIF_ABI_PENDING); | ||
| 562 | if (test_ti_thread_flag(t, TIF_32BIT)) | ||
| 563 | clear_ti_thread_flag(t, TIF_32BIT); | ||
| 564 | else | ||
| 565 | set_ti_thread_flag(t, TIF_32BIT); | ||
| 566 | } | ||
| 567 | #endif | ||
| 568 | |||
| 569 | discard_lazy_cpu_state(); | 557 | discard_lazy_cpu_state(); |
| 570 | 558 | ||
| 571 | if (current->thread.dabr) { | 559 | if (current->thread.dabr) { |