From c2960ee4dd72cbd4a13ea91e11d8260d64af8189 Mon Sep 17 00:00:00 2001 From: Sebastian Siewior Date: Thu, 1 May 2008 12:17:49 +1000 Subject: [PATCH] --- yaml --- r: 95703 b: refs/heads/master c: 6c5a7d504fb0e27aa90b96267177d434642a393d h: refs/heads/master i: 95701: 3c921f5255c76adc9cfc1932b368b506e4ff178e 95699: 846e662f4aa289a5699e693b292d36fc435aa49c 95695: 912e05411344afda3c1411c0ee6e99d462e4ff89 v: v3 --- [refs] | 2 +- trunk/arch/m68knommu/platform/coldfire/entry.S | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index eccd343eedfb..c9a2bc049cf9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0042a1f7ecbc5d40eb2164f375ec87ecf3494418 +refs/heads/master: 6c5a7d504fb0e27aa90b96267177d434642a393d diff --git a/trunk/arch/m68knommu/platform/coldfire/entry.S b/trunk/arch/m68knommu/platform/coldfire/entry.S index 1af7c1d650f6..1e3c0dcbd7ac 100644 --- a/trunk/arch/m68knommu/platform/coldfire/entry.S +++ b/trunk/arch/m68knommu/platform/coldfire/entry.S @@ -103,6 +103,7 @@ ret_from_signal: addql #4,%sp ret_from_exception: + move #0x2700,%sr /* disable intrs */ btst #5,%sp@(PT_SR) /* check if returning to kernel */ jeq Luser_return /* if so, skip resched, signals */ @@ -156,6 +157,7 @@ Lreturn: Lwork_to_do: movel %a0@(TI_FLAGS),%d1 /* get thread_info->flags */ + move #0x2000,%sr /* enable intrs again */ btst #TIF_NEED_RESCHED,%d1 jne reschedule