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>

3 files changed, 11 insertions, 11 deletions

diff --git a/arch/m68k/platform/68328/entry.S b/arch/m68k/platform/68328/entry.S
index 676960cf022a..3e4675996a71 100644
--- a/arch/m68k/platform/68328/entry.S
+++ b/arch/m68k/platform/68328/entry.S
@@ -80,7 +80,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
@@ -107,12 +107,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
 
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
 
diff --git a/arch/m68k/platform/coldfire/entry.S b/arch/m68k/platform/coldfire/entry.S
index eab63f09965b..eee9a06aa265 100644
--- a/arch/m68k/platform/coldfire/entry.S
+++ b/arch/m68k/platform/coldfire/entry.S
@@ -78,7 +78,7 @@ ENTRY(system_call)
         movel   %d2,%a0
         movel   %a0@,%a1                /* save top of frame */
         movel   %sp,%a1@(TASK_THREAD+THREAD_ESP0)
-        btst    #(TIF_SYSCALL_TRACE%8),%a0@(TI_FLAGS+(31-TIF_SYSCALL_TRACE)/8)
+        btst    #(TIF_SYSCALL_TRACE%8),%a0@(TINFO_FLAGS+(31-TIF_SYSCALL_TRACE)/8)
         bnes    1f
 
         movel   %d3,%a0
@@ -113,11 +113,11 @@ ret_from_exception:
         movel   %sp,%d1                 /* get thread_info pointer */
         andl    #-THREAD_SIZE,%d1       /* at base of kernel stack */
         movel   %d1,%a0
-        movel   %a0@(TI_FLAGS),%d1      /* get thread_info->flags */
+        movel   %a0@(TINFO_FLAGS),%d1   /* get thread_info->flags */
         andl    #(1<<TIF_NEED_RESCHED),%d1
         jeq     Lkernel_return
 
-        movel   %a0@(TI_PREEMPTCOUNT),%d1
+        movel   %a0@(TINFO_PREEMPT),%d1
         cmpl    #0,%d1
         jne     Lkernel_return
 
@@ -137,14 +137,14 @@ Luser_return:
         movel   %sp,%d1                 /* get thread_info pointer */
         andl    #-THREAD_SIZE,%d1       /* at base of kernel stack */
         movel   %d1,%a0
-        movel   %a0@(TI_FLAGS),%d1      /* get thread_info->flags */
+        movel   %a0@(TINFO_FLAGS),%d1   /* get thread_info->flags */
         jne     Lwork_to_do             /* still work to do */
 
 Lreturn:
         RESTORE_USER
 
 Lwork_to_do:
-        movel   %a0@(TI_FLAGS),%d1      /* get thread_info->flags */
+        movel   %a0@(TINFO_FLAGS),%d1   /* get thread_info->flags */
         move    #0x2000,%sr             /* enable intrs again */
         btst    #TIF_NEED_RESCHED,%d1
         jne     reschedule