m68k: merge mmu and non-mmu versions of asm-offsets.c

It is strait forward to merge the mmu and non-mmu versions of
asm-offstes.c. Some name changes are required for the preempt and
thread_info.flags in the non-mmu entry.S assembler to make them
consistent for both setups.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/m68k/platform/68360/entry.S b/arch/m68k/platform/68360/entry.S
index 46c1b18c9dcb..50dcae66f6cd 100644
--- a/arch/m68k/platform/68360/entry.S
+++ b/arch/m68k/platform/68360/entry.S
@@ -76,7 +76,7 @@ ENTRY(system_call)
         movel   %sp,%d1                 /* get thread_info pointer */
         andl    #-THREAD_SIZE,%d1
         movel   %d1,%a2
-        btst    #(TIF_SYSCALL_TRACE%8),%a2@(TI_FLAGS+(31-TIF_SYSCALL_TRACE)/8)
+        btst    #(TIF_SYSCALL_TRACE%8),%a2@(TINFO_FLAGS+(31-TIF_SYSCALL_TRACE)/8)
         jne     do_trace
         cmpl    #NR_syscalls,%d0
         jcc     badsys
@@ -103,12 +103,12 @@ Luser_return:
         andl    #-THREAD_SIZE,%d1
         movel   %d1,%a2
 1:
-        move    %a2@(TI_FLAGS),%d1      /* thread_info->flags */
+        move    %a2@(TINFO_FLAGS),%d1   /* thread_info->flags */
         jne     Lwork_to_do
         RESTORE_ALL
 
 Lwork_to_do:
-        movel   %a2@(TI_FLAGS),%d1      /* thread_info->flags */
+        movel   %a2@(TINFO_FLAGS),%d1   /* thread_info->flags */
         btst    #TIF_NEED_RESCHED,%d1
         jne     reschedule