diff options
| author | Greg Ungerer <gerg@snapgear.com> | 2010-09-13 00:10:45 -0400 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2010-10-22 03:43:24 -0400 |
| commit | cddafa3500fde4a07e5bf899ec97a04069f8f7ce (patch) | |
| tree | cbef023cf9a2d80a1f09d5e80b902780c636236f /arch/m68knommu | |
| parent | 69f99746a2cfd88b9caed8e320ad86405b228ada (diff) | |
m68k/m68knommu: merge MMU and non-MMU thread_info.h
The MMU and non-MMU versions of thread_info.h are quite similar.
Merge the two files.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68knommu')
| -rw-r--r-- | arch/m68knommu/platform/coldfire/entry.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68knommu/platform/coldfire/entry.S b/arch/m68knommu/platform/coldfire/entry.S index dd7d591f70ea..cd79d7e92ce6 100644 --- a/arch/m68knommu/platform/coldfire/entry.S +++ b/arch/m68knommu/platform/coldfire/entry.S | |||
| @@ -112,7 +112,7 @@ ret_from_exception: | |||
| 112 | andl #-THREAD_SIZE,%d1 /* at base of kernel stack */ | 112 | andl #-THREAD_SIZE,%d1 /* at base of kernel stack */ |
| 113 | movel %d1,%a0 | 113 | movel %d1,%a0 |
| 114 | movel %a0@(TI_FLAGS),%d1 /* get thread_info->flags */ | 114 | movel %a0@(TI_FLAGS),%d1 /* get thread_info->flags */ |
| 115 | andl #_TIF_NEED_RESCHED,%d1 | 115 | andl #(1<<TIF_NEED_RESCHED),%d1 |
| 116 | jeq Lkernel_return | 116 | jeq Lkernel_return |
| 117 | 117 | ||
| 118 | movel %a0@(TI_PREEMPTCOUNT),%d1 | 118 | movel %a0@(TI_PREEMPTCOUNT),%d1 |
| @@ -136,7 +136,7 @@ Luser_return: | |||
| 136 | andl #-THREAD_SIZE,%d1 /* at base of kernel stack */ | 136 | andl #-THREAD_SIZE,%d1 /* at base of kernel stack */ |
| 137 | movel %d1,%a0 | 137 | movel %d1,%a0 |
| 138 | movel %a0@(TI_FLAGS),%d1 /* get thread_info->flags */ | 138 | movel %a0@(TI_FLAGS),%d1 /* get thread_info->flags */ |
| 139 | andl #_TIF_WORK_MASK,%d1 | 139 | andl #0xefff,%d1 |
| 140 | jne Lwork_to_do /* still work to do */ | 140 | jne Lwork_to_do /* still work to do */ |
| 141 | 141 | ||
| 142 | Lreturn: | 142 | Lreturn: |