diff --git a/[refs] b/[refs] index 049db2ee340b..30c8c818ecbe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce1bb7afc5648056cf66896c4aebc0062bb12f79 +refs/heads/master: 5ec80e50e11bcc3f39e47b9dc73110dbc58e4780 diff --git a/trunk/arch/cris/include/arch-v10/arch/processor.h b/trunk/arch/cris/include/arch-v10/arch/processor.h index cc692c7a0660..93feb2a487d8 100644 --- a/trunk/arch/cris/include/arch-v10/arch/processor.h +++ b/trunk/arch/cris/include/arch-v10/arch/processor.h @@ -53,7 +53,6 @@ struct thread_struct { */ #define start_thread(regs, ip, usp) do { \ - set_fs(USER_DS); \ regs->irp = ip; \ regs->dccr |= 1 << U_DCCR_BITNR; \ wrusp(usp); \ diff --git a/trunk/arch/cris/include/arch-v32/arch/processor.h b/trunk/arch/cris/include/arch-v32/arch/processor.h index f80b47790ca6..9603c907fbc4 100644 --- a/trunk/arch/cris/include/arch-v32/arch/processor.h +++ b/trunk/arch/cris/include/arch-v32/arch/processor.h @@ -47,7 +47,6 @@ struct thread_struct { */ #define start_thread(regs, ip, usp) \ do { \ - set_fs(USER_DS); \ regs->erp = ip; \ regs->ccs |= 1 << (U_CCS_BITNR + CCS_SHIFT); \ wrusp(usp); \