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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Add missing I/O macros {in,out}{w,l}_p() for !CONFIG_ISA
  m68k: Remove big kernel lock in cache flush code
  m68k: __pa(): cast arg to long
  fbdev: atafb - Remove undead ifdef ATAFB_FALCON
  zorro: Fix device_register() error handling
  fbdev/m68k: Fix section mismatches in q40fb.c
  m68k/m68knommu: merge the MMU and non-MMU traps.h
  m68k/m68knommu: merge MMU and non-MMU thread_info.h
  m68k/m68knommu: merge MMU and non-MMU atomic.h
  m68k/m68knommu: clean up page.h
  m68k/m68knommu: merge machdep.h files into a single file
  m68k/m68knommu: merge MMU and non-MMU string.h
  m68k/m68knommu: Remove dead SMP config option
  m68k: move definition of THREAD_SIZE into thread_info_mm.h
  m68k: Use asm-generic/ioctls.h (enables termiox)
  m68k: Remove dead GG2 config option

diff --combined arch/m68k/include/asm/system_mm.h
index 12053c44cccfe38d06ca1b556da85f1720f227dd,485daecb350b7d9443b5ee21594719f836749623..47b01f4726bc76d3afd834f9eb840de64c68998c
--- 1/arch/m68k/include/asm/system_mm.h
--- 2/arch/m68k/include/asm/system_mm.h
+++ b/arch/m68k/include/asm/system_mm.h
@@@ -3,7 -3,6 +3,7 @@@
  
  #include <linux/linkage.h>
  #include <linux/kernel.h>
 +#include <linux/irqflags.h>
  #include <asm/segment.h>
  #include <asm/entry.h>
  
@@@ -63,6 -62,30 +63,6 @@@ asmlinkage void resume(void)
  #define smp_wmb()     barrier()
  #define smp_read_barrier_depends()    ((void)0)
  
 -/* interrupt control.. */
 -#if 0
 -#define local_irq_enable() asm volatile ("andiw %0,%%sr": : "i" (ALLOWINT) : "memory")
 -#else
 -#include <linux/hardirq.h>
 -#define local_irq_enable() ({                                                 \
 -      if (MACH_IS_Q40 || !hardirq_count())                                    \
 -              asm volatile ("andiw %0,%%sr": : "i" (ALLOWINT) : "memory");    \
 -})
 -#endif
 -#define local_irq_disable() asm volatile ("oriw  #0x0700,%%sr": : : "memory")
 -#define local_save_flags(x) asm volatile ("movew %%sr,%0":"=d" (x) : : "memory")
 -#define local_irq_restore(x) asm volatile ("movew %0,%%sr": :"d" (x) : "memory")
 -
 -static inline int irqs_disabled(void)
 -{
 -      unsigned long flags;
 -      local_save_flags(flags);
 -      return flags & ~ALLOWINT;
 -}
 -
 -/* For spinlocks etc */
 -#define local_irq_save(x)     ({ local_save_flags(x); local_irq_disable(); })
 -
  #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
  
  struct __xchg_dummy { unsigned long a[100]; };
@@@ -182,9 -205,7 +182,7 @@@ static inline unsigned long __cmpxchg(v
        ((__typeof__(*(ptr)))__cmpxchg_local_generic((ptr), (unsigned long)(o),\
                        (unsigned long)(n), sizeof(*(ptr))))
  
- #ifndef CONFIG_SMP
  #include <asm-generic/cmpxchg.h>
- #endif
  
  #endif
  

diff --combined arch/m68k/include/asm/system_no.h
index 20126c09794e5f59d7b58a94fcb07eb9a8e2d6f9,08f31bdba36db942fb20cf77bdb858b98b91c84a..6fe9f93bc3ffffb0b89fd07840f4462227340040
--- 1/arch/m68k/include/asm/system_no.h
--- 2/arch/m68k/include/asm/system_no.h
+++ b/arch/m68k/include/asm/system_no.h
@@@ -2,7 -2,6 +2,7 @@@
  #define _M68KNOMMU_SYSTEM_H
  
  #include <linux/linkage.h>
 +#include <linux/irqflags.h>
  #include <asm/segment.h>
  #include <asm/entry.h>
  
@@@ -47,6 -46,54 +47,6 @@@ asmlinkage void resume(void)
    (last) = _last;                                             \
  }
  
 -#ifdef CONFIG_COLDFIRE
 -#define local_irq_enable() __asm__ __volatile__ (             \
 -      "move %/sr,%%d0\n\t"                                    \
 -      "andi.l #0xf8ff,%%d0\n\t"                               \
 -      "move %%d0,%/sr\n"                                      \
 -      : /* no outputs */                                      \
 -      :                                                       \
 -        : "cc", "%d0", "memory")
 -#define local_irq_disable() __asm__ __volatile__ (            \
 -      "move %/sr,%%d0\n\t"                                    \
 -      "ori.l #0x0700,%%d0\n\t"                                \
 -      "move %%d0,%/sr\n"                                      \
 -      : /* no outputs */                                      \
 -      :                                                       \
 -      : "cc", "%d0", "memory")
 -/* For spinlocks etc */
 -#define local_irq_save(x) __asm__ __volatile__ (              \
 -      "movew %%sr,%0\n\t"                                     \
 -      "movew #0x0700,%%d0\n\t"                                \
 -      "or.l  %0,%%d0\n\t"                                     \
 -      "movew %%d0,%/sr"                                       \
 -      : "=d" (x)                                              \
 -      :                                                       \
 -      : "cc", "%d0", "memory")
 -#else
 -
 -/* portable version */ /* FIXME - see entry.h*/
 -#define ALLOWINT 0xf8ff
 -
 -#define local_irq_enable() asm volatile ("andiw %0,%%sr": : "i" (ALLOWINT) : "memory")
 -#define local_irq_disable() asm volatile ("oriw  #0x0700,%%sr": : : "memory")
 -#endif
 -
 -#define local_save_flags(x) asm volatile ("movew %%sr,%0":"=d" (x) : : "memory")
 -#define local_irq_restore(x) asm volatile ("movew %0,%%sr": :"d" (x) : "memory")
 -
 -/* For spinlocks etc */
 -#ifndef local_irq_save
 -#define local_irq_save(x) do { local_save_flags(x); local_irq_disable(); } while (0)
 -#endif
 -
 -#define       irqs_disabled()                 \
 -({                                    \
 -      unsigned long flags;            \
 -      local_save_flags(flags);        \
 -      ((flags & 0x0700) == 0x0700);   \
 -})
 -
  #define iret() __asm__ __volatile__ ("rte": : :"memory", "sp", "cc")
  
  /*
@@@ -59,17 -106,10 +59,10 @@@
  #define wmb()  asm volatile (""   : : :"memory")
  #define set_mb(var, value)    ({ (var) = (value); wmb(); })
  
- #ifdef CONFIG_SMP
- #define smp_mb()      mb()
- #define smp_rmb()     rmb()
- #define smp_wmb()     wmb()
- #define smp_read_barrier_depends()    read_barrier_depends()
- #else
  #define smp_mb()      barrier()
  #define smp_rmb()     barrier()
  #define smp_wmb()     barrier()
  #define smp_read_barrier_depends()    do { } while(0)
- #endif
  
  #define read_barrier_depends()  ((void)0)
  
@@@ -152,11 -192,17 +145,9 @@@ static inline unsigned long __xchg(unsi
                        (unsigned long)(n), sizeof(*(ptr))))
  #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
  
- #ifndef CONFIG_SMP
  #include <asm-generic/cmpxchg.h>
- #endif
  
  #define arch_align_stack(x) (x)
  
  
 -static inline int irqs_disabled_flags(unsigned long flags)
 -{
 -      if (flags & 0x0700)
 -              return 0;
 -      else
 -              return 1;
 -}
 -
  #endif /* _M68KNOMMU_SYSTEM_H */