From 1389040746d966b81904d36ec7f5dc95ed986109 Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Tue, 18 Sep 2007 18:49:08 +0100 Subject: [PATCH] --- yaml --- r: 66161 b: refs/heads/master c: e5d77754c5e1a54f9eb61c03085d7932a0b6b738 h: refs/heads/master i: 66159: 7e0c5fe7a80acf452d60b82b632d752d70135088 v: v3 --- [refs] | 2 +- trunk/arch/mips/kernel/process.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3c893ef5eb96..5fa1411c92e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f5c90644240cc17d5940fa3594cc51ad1ae7ba7 +refs/heads/master: e5d77754c5e1a54f9eb61c03085d7932a0b6b738 diff --git a/trunk/arch/mips/kernel/process.c b/trunk/arch/mips/kernel/process.c index e6ce943099a0..aadd2cd5778c 100644 --- a/trunk/arch/mips/kernel/process.c +++ b/trunk/arch/mips/kernel/process.c @@ -231,8 +231,8 @@ long kernel_thread(int (*fn)(void *), void *arg, unsigned long flags) regs.cp0_epc = (unsigned long) kernel_thread_helper; regs.cp0_status = read_c0_status(); #if defined(CONFIG_CPU_R3000) || defined(CONFIG_CPU_TX39XX) - regs.cp0_status &= ~(ST0_KUP | ST0_IEC); - regs.cp0_status |= ST0_IEP; + regs.cp0_status = (regs.cp0_status & ~(ST0_KUP | ST0_IEP | ST0_IEC)) | + ((regs.cp0_status & (ST0_KUC | ST0_IEC)) << 2); #else regs.cp0_status |= ST0_EXL; #endif