Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (21 commits)
  m68knommu: convert to using tracehook_report_syscall_*
  m68knommu: some boards use fixed phy for FEC ethernet
  m68knommu: support the external GPIO based interrupts of the 5272
  m68knommu: mask of vector bits in exception word properly
  m68knommu: change to new flag variables
  m68knommu: Fix MCFUART_TXFIFOSIZE for m548x.
  m68knommu: add basic mmu-less m548x support
  m68knommu: .gitignore vmlinux.lds
  m68knommu: stop using __do_IRQ
  m68knommu: rename PT_OFF_VECTOR to PT_OFF_FORMATVEC.
  m68knommu: add support for Coldfire 547x/548x interrupt controller
  m68k{nommu}: Remove unused DEFINE's from asm-offsets.c
  m68knommu: whitespace cleanup in 68328/entry.S
  m68knommu: Document supported chips in intc-2.c and intc-simr.c.
  m68knommu: fix strace support for 68328/68360
  m68knommu: fix default starting date
  arch/m68knommu: Removing dead 68328_SERIAL_UART2 config option
  arch/m68knommu: Removing dead RAM_{16,32}_MB config option
  arch/m68knommu: Removing dead M68KFPU_EMU config option
  arch/m68knommu: Removing dead RELOCATE config option
  ...

diff --combined arch/m68knommu/kernel/asm-offsets.c
index 24335022fa2c74893b695d041b330c4810680087,8156287f19b4641c867b829c6dc7c0e458c9ac95..ffe02f41ad4683467db62e922b9efba6d0955c08
--- 1/arch/m68knommu/kernel/asm-offsets.c
--- 2/arch/m68knommu/kernel/asm-offsets.c
+++ b/arch/m68knommu/kernel/asm-offsets.c
@@@ -21,14 -21,8 +21,8 @@@
  int main(void)
  {
        /* offsets into the task struct */
-       DEFINE(TASK_STATE, offsetof(struct task_struct, state));
-       DEFINE(TASK_FLAGS, offsetof(struct task_struct, flags));
-       DEFINE(TASK_PTRACE, offsetof(struct task_struct, ptrace));
-       DEFINE(TASK_BLOCKED, offsetof(struct task_struct, blocked));
        DEFINE(TASK_THREAD, offsetof(struct task_struct, thread));
-       DEFINE(TASK_THREAD_INFO, offsetof(struct task_struct, stack));
        DEFINE(TASK_MM, offsetof(struct task_struct, mm));
-       DEFINE(TASK_ACTIVE_MM, offsetof(struct task_struct, active_mm));
  
        /* offsets into the irq_cpustat_t struct */
        DEFINE(CPUSTAT_SOFTIRQ_PENDING, offsetof(irq_cpustat_t, __softirq_pending));
@@@ -63,7 -57,7 +57,7 @@@
        DEFINE(PT_OFF_FORMATVEC, offsetof(struct pt_regs, sr) - 2);
  #else
        /* bitfields are a bit difficult */
-       DEFINE(PT_OFF_VECTOR, offsetof(struct pt_regs, pc) + 4);
+       DEFINE(PT_OFF_FORMATVEC, offsetof(struct pt_regs, pc) + 4);
  #endif
  
        /* signal defines */
@@@ -74,12 -68,11 +68,9 @@@
  
        DEFINE(PT_PTRACED, PT_PTRACED);
  
 -      DEFINE(THREAD_SIZE, THREAD_SIZE);
 -
        /* Offsets in thread_info structure */
-       DEFINE(TI_TASK, offsetof(struct thread_info, task));
-       DEFINE(TI_EXECDOMAIN, offsetof(struct thread_info, exec_domain));
        DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
        DEFINE(TI_PREEMPTCOUNT, offsetof(struct thread_info, preempt_count));
-       DEFINE(TI_CPU, offsetof(struct thread_info, cpu));
  
        return 0;
  }

diff --combined arch/m68knommu/kernel/time.c
index 7089dd9d843b3fd65d39be90060f612e7deddd77,810649341e3e3b3faab2cff40cf5c124a85ca364..d6ac2a43453ce5be5808a0fa6aeacd4666cf8da6
--- 1/arch/m68knommu/kernel/time.c
--- 2/arch/m68knommu/kernel/time.c
+++ b/arch/m68knommu/kernel/time.c
@@@ -50,8 -50,9 +50,8 @@@ irqreturn_t arch_timer_interrupt(int ir
  
        write_sequnlock(&xtime_lock);
  
 -#ifndef CONFIG_SMP
        update_process_times(user_mode(get_irq_regs()));
 -#endif
 +
        return(IRQ_HANDLED);
  }
  #endif
@@@ -60,13 -61,16 +60,16 @@@ static unsigned long read_rtc_mmss(void
  {
        unsigned int year, mon, day, hour, min, sec;
  
-       if (mach_gettod)
+       if (mach_gettod) {
                mach_gettod(&year, &mon, &day, &hour, &min, &sec);
-       else
-               year = mon = day = hour = min = sec = 0;
+               if ((year += 1900) < 1970)
+                       year += 100;
+       } else {
+               year = 1970;
+               mon = day = 1;
+               hour = min = sec = 0;
+       }
  
-       if ((year += 1900) < 1970)
-               year += 100;
  
        return  mktime(year, mon, day, hour, min, sec);
  }

diff --combined arch/m68knommu/platform/coldfire/entry.S
index cd79d7e92ce64ee61c1d1c9e08c10f978ad6c87a,c8eb0e01e2ec2c811eb6faf4e47fdc095e5f929b..5e92bed94b7e56c9f4e543bed2897e18128a8b3e
--- 1/arch/m68knommu/platform/coldfire/entry.S
--- 2/arch/m68knommu/platform/coldfire/entry.S
+++ b/arch/m68knommu/platform/coldfire/entry.S
@@@ -88,7 -88,7 +88,7 @@@ ENTRY(system_call
        movel   %d2,PT_OFF_D0(%sp)      /* on syscall entry */
        subql   #4,%sp
        SAVE_SWITCH_STACK
-       jbsr    syscall_trace
+       jbsr    syscall_trace_enter
        RESTORE_SWITCH_STACK
        addql   #4,%sp
        movel   %d3,%a0
@@@ -96,7 -96,7 +96,7 @@@
        movel   %d0,%sp@(PT_OFF_D0)             /* save the return value */
        subql   #4,%sp                  /* dummy return address */
        SAVE_SWITCH_STACK
-       jbsr    syscall_trace
+       jbsr    syscall_trace_leave
  
  ret_from_signal:
        RESTORE_SWITCH_STACK
@@@ -112,7 -112,7 +112,7 @@@ ret_from_exception
        andl    #-THREAD_SIZE,%d1       /* at base of kernel stack */
        movel   %d1,%a0
        movel   %a0@(TI_FLAGS),%d1      /* get thread_info->flags */
 -      andl    #_TIF_NEED_RESCHED,%d1
 +      andl    #(1<<TIF_NEED_RESCHED),%d1
        jeq     Lkernel_return
  
        movel   %a0@(TI_PREEMPTCOUNT),%d1
@@@ -136,7 -136,7 +136,7 @@@ Luser_return
        andl    #-THREAD_SIZE,%d1       /* at base of kernel stack */
        movel   %d1,%a0
        movel   %a0@(TI_FLAGS),%d1      /* get thread_info->flags */
 -      andl    #_TIF_WORK_MASK,%d1
 +      andl    #0xefff,%d1
        jne     Lwork_to_do             /* still work to do */
  
  Lreturn: