diff options
Diffstat (limited to 'arch/powerpc/kernel/process.c')
-rw-r--r-- | arch/powerpc/kernel/process.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index 8e701a4ed36b..2e743de545d0 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c | |||
@@ -804,16 +804,8 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, | |||
804 | #endif /* CONFIG_PPC_STD_MMU_64 */ | 804 | #endif /* CONFIG_PPC_STD_MMU_64 */ |
805 | #ifdef CONFIG_PPC64 | 805 | #ifdef CONFIG_PPC64 |
806 | if (cpu_has_feature(CPU_FTR_DSCR)) { | 806 | if (cpu_has_feature(CPU_FTR_DSCR)) { |
807 | if (current->thread.dscr_inherit) { | 807 | p->thread.dscr_inherit = current->thread.dscr_inherit; |
808 | p->thread.dscr_inherit = 1; | 808 | p->thread.dscr = current->thread.dscr; |
809 | p->thread.dscr = current->thread.dscr; | ||
810 | } else if (0 != dscr_default) { | ||
811 | p->thread.dscr_inherit = 1; | ||
812 | p->thread.dscr = dscr_default; | ||
813 | } else { | ||
814 | p->thread.dscr_inherit = 0; | ||
815 | p->thread.dscr = 0; | ||
816 | } | ||
817 | } | 809 | } |
818 | #endif | 810 | #endif |
819 | 811 | ||