diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-06-06 02:21:03 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-06-06 02:21:03 -0500 |
| commit | 3c241f8337542655ee013a661b7f1770f561d3ef (patch) | |
| tree | 79dd9a5dd12d305e1be7b926d414855377d2e192 /arch/ppc64/kernel/entry.S | |
| parent | dbf4ccd6043e58ed32fbf253fb3f0a9991e4c13a (diff) | |
| parent | eae936e21bd726f9d9555f2262d439fbcd61dccf (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/ppc64/kernel/entry.S')
| -rw-r--r-- | arch/ppc64/kernel/entry.S | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/ppc64/kernel/entry.S b/arch/ppc64/kernel/entry.S index d3604056e1a..b61572eb2a7 100644 --- a/arch/ppc64/kernel/entry.S +++ b/arch/ppc64/kernel/entry.S @@ -436,15 +436,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) REST_8GPRS(14, r1) REST_10GPRS(22, r1) -#ifdef CONFIG_PPC_ISERIES - clrrdi r7,r1,THREAD_SHIFT /* get current_thread_info() */ - ld r7,TI_FLAGS(r7) /* Get run light flag */ - mfspr r9,CTRLF - srdi r7,r7,TIF_RUN_LIGHT - insrdi r9,r7,1,63 /* Insert run light into CTRL */ - mtspr CTRLT,r9 -#endif - /* convert old thread to its task_struct for return value */ addi r3,r3,-THREAD ld r7,_NIP(r1) /* Return to _switch caller in new task */ |