diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2011-02-02 20:17:55 -0500 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2011-02-08 00:07:45 -0500 |
| commit | b3e338de7e11d1e5bc4eca12833d894d1838b510 (patch) | |
| tree | 980cf1c3fe3ad216b9ae043988b35995482d9560 /arch | |
| parent | 4157a04d5d7def8661559cd98eb285a520d50075 (diff) | |
m68knommu: fix use of un-defined _TIF_WORK_MASK
The _TIF_WORK_MASK definition was removed in the clean up of MMU and
non-MMU arch/m68k/include/asm/thread_info*.h files (this was commit
cddafa3500fde4a07e5bf899ec97a04069f8f7ce, "merge MMU and non-MMU
thread_info.h").
It didn't get cleaned out of the entry.S code for the 68328 and 68360
based platforms. And it was replaced by a hard coded constant mask for
coldfire platforms. There is currently no need to mask any of these bits,
so fix all uses (and former uses) to check for any non-zero value.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m68knommu/platform/68328/entry.S | 1 | ||||
| -rw-r--r-- | arch/m68knommu/platform/68360/entry.S | 1 | ||||
| -rw-r--r-- | arch/m68knommu/platform/coldfire/entry.S | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/arch/m68knommu/platform/68328/entry.S b/arch/m68knommu/platform/68328/entry.S index 240a7a6e25c8..676960cf022a 100644 --- a/arch/m68knommu/platform/68328/entry.S +++ b/arch/m68knommu/platform/68328/entry.S | |||
| @@ -108,7 +108,6 @@ Luser_return: | |||
| 108 | movel %d1,%a2 | 108 | movel %d1,%a2 |
| 109 | 1: | 109 | 1: |
| 110 | move %a2@(TI_FLAGS),%d1 /* thread_info->flags */ | 110 | move %a2@(TI_FLAGS),%d1 /* thread_info->flags */ |
| 111 | andl #_TIF_WORK_MASK,%d1 | ||
| 112 | jne Lwork_to_do | 111 | jne Lwork_to_do |
| 113 | RESTORE_ALL | 112 | RESTORE_ALL |
| 114 | 113 | ||
diff --git a/arch/m68knommu/platform/68360/entry.S b/arch/m68knommu/platform/68360/entry.S index 8a28788c0eea..46c1b18c9dcb 100644 --- a/arch/m68knommu/platform/68360/entry.S +++ b/arch/m68knommu/platform/68360/entry.S | |||
| @@ -104,7 +104,6 @@ Luser_return: | |||
| 104 | movel %d1,%a2 | 104 | movel %d1,%a2 |
| 105 | 1: | 105 | 1: |
| 106 | move %a2@(TI_FLAGS),%d1 /* thread_info->flags */ | 106 | move %a2@(TI_FLAGS),%d1 /* thread_info->flags */ |
| 107 | andl #_TIF_WORK_MASK,%d1 | ||
| 108 | jne Lwork_to_do | 107 | jne Lwork_to_do |
| 109 | RESTORE_ALL | 108 | RESTORE_ALL |
| 110 | 109 | ||
diff --git a/arch/m68knommu/platform/coldfire/entry.S b/arch/m68knommu/platform/coldfire/entry.S index 4ddfc3da70d8..5837cf080b6d 100644 --- a/arch/m68knommu/platform/coldfire/entry.S +++ b/arch/m68knommu/platform/coldfire/entry.S | |||
| @@ -138,7 +138,6 @@ Luser_return: | |||
| 138 | andl #-THREAD_SIZE,%d1 /* at base of kernel stack */ | 138 | andl #-THREAD_SIZE,%d1 /* at base of kernel stack */ |
| 139 | movel %d1,%a0 | 139 | movel %d1,%a0 |
| 140 | movel %a0@(TI_FLAGS),%d1 /* get thread_info->flags */ | 140 | movel %a0@(TI_FLAGS),%d1 /* get thread_info->flags */ |
| 141 | andl #0xefff,%d1 | ||
| 142 | jne Lwork_to_do /* still work to do */ | 141 | jne Lwork_to_do /* still work to do */ |
| 143 | 142 | ||
| 144 | Lreturn: | 143 | Lreturn: |