56 files changed, 546 insertions, 1189 deletions

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index ecdc19a299b2..b5da298ba61d 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -536,10 +536,6 @@ config GVPIOEXT_PLIP
           Say Y to enable doing IP over the parallel port on your GVP
           IO-Extender card, N otherwise.
 
-config MAC_SCC
-        tristate "Macintosh serial support"
-        depends on MAC
-
 config MAC_HID
         bool
         depends on INPUT_ADBHID
@@ -595,7 +591,7 @@ config DN_SERIAL
 
 config SERIAL_CONSOLE
         bool "Support for serial port console"
-        depends on (AMIGA || ATARI || MAC || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_MIDI=y || MAC_SCC=y || AMIGA_BUILTIN_SERIAL=y || GVPIOEXT=y || MULTIFACE_III_TTY=y || SERIAL=y || MVME147_SCC || SERIAL167 || MVME162_SCC || BVME6000_SCC || DN_SERIAL)
+        depends on (AMIGA || ATARI || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_MIDI=y || AMIGA_BUILTIN_SERIAL=y || GVPIOEXT=y || MULTIFACE_III_TTY=y || SERIAL=y || MVME147_SCC || SERIAL167 || MVME162_SCC || BVME6000_SCC || DN_SERIAL)
         ---help---
           If you say Y here, it will be possible to use a serial port as the
           system console (the system console is the device which receives all
diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c
index 6c74751c7b82..d2cc35d98532 100644
--- a/arch/m68k/amiga/config.c
+++ b/arch/m68k/amiga/config.c
@@ -480,7 +480,7 @@ static void __init amiga_sched_init(irq_handler_t timer_routine)
         static struct resource sched_res = {
                 .name = "timer", .start = 0x00bfd400, .end = 0x00bfd5ff,
         };
-        jiffy_ticks = (amiga_eclock+HZ/2)/HZ;
+        jiffy_ticks = DIV_ROUND_CLOSEST(amiga_eclock, HZ);
 
         if (request_resource(&mb_resources._ciab, &sched_res))
                 printk("Cannot allocate ciab.ta{lo,hi}\n");
diff --git a/arch/m68k/atari/atakeyb.c b/arch/m68k/atari/atakeyb.c
index 4add96d13b19..5890897d28bf 100644
--- a/arch/m68k/atari/atakeyb.c
+++ b/arch/m68k/atari/atakeyb.c
@@ -121,7 +121,7 @@ KEYBOARD_STATE kb_state;
  * bytes have been lost and in which state of the packet structure we are now.
  * This usually causes keyboards bytes to be interpreted as mouse movements
  * and vice versa, which is very annoying. It seems better to throw away some
- * bytes (that are usually mouse bytes) than to misinterpret them. Therefor I
+ * bytes (that are usually mouse bytes) than to misinterpret them. Therefore I
  * introduced the RESYNC state for IKBD data. In this state, the bytes up to
  * one that really looks like a key event (0x04..0xf2) or the start of a mouse
  * packet (0xf8..0xfb) are thrown away, but at most 2 bytes. This at least
diff --git a/arch/m68k/bvme6000/rtc.c b/arch/m68k/bvme6000/rtc.c
index c50bec8aabb1..b46ea1714a89 100644
--- a/arch/m68k/bvme6000/rtc.c
+++ b/arch/m68k/bvme6000/rtc.c
@@ -9,7 +9,6 @@
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/miscdevice.h>
-#include <linux/slab.h>
 #include <linux/smp_lock.h>
 #include <linux/ioport.h>
 #include <linux/capability.h>
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig
index 9991b64fea57..c5f3232ff916 100644
--- a/arch/m68k/configs/mac_defconfig
+++ b/arch/m68k/configs/mac_defconfig
@@ -701,6 +701,11 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
 #
 # Non-8250 serial port support
 #
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_PMACZILOG=y
+CONFIG_SERIAL_PMACZILOG_TTYS=y
+CONFIG_SERIAL_PMACZILOG_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 CONFIG_LEGACY_PTYS=y
@@ -834,9 +839,7 @@ CONFIG_HIDRAW=y
 #
 # Character devices
 #
-CONFIG_MAC_SCC=y
 CONFIG_MAC_HID=y
-CONFIG_SERIAL_CONSOLE=y
 
 #
 # File systems
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig
index 69c43e2d8b45..a8bfa3fa71cf 100644
--- a/arch/m68k/configs/multi_defconfig
+++ b/arch/m68k/configs/multi_defconfig
@@ -822,6 +822,11 @@ CONFIG_A2232=y
 #
 # Non-8250 serial port support
 #
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_PMACZILOG=y
+CONFIG_SERIAL_PMACZILOG_TTYS=y
+CONFIG_SERIAL_PMACZILOG_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 CONFIG_LEGACY_PTYS=y
@@ -982,7 +987,6 @@ CONFIG_ATARI_MIDI=y
 CONFIG_ATARI_DSP56K=m
 CONFIG_AMIGA_BUILTIN_SERIAL=y
 CONFIG_MULTIFACE_III_TTY=m
-CONFIG_MAC_SCC=y
 CONFIG_MAC_HID=y
 CONFIG_MVME147_SCC=y
 CONFIG_SERIAL167=y
diff --git a/arch/m68k/ifpsp060/src/fpsp.S b/arch/m68k/ifpsp060/src/fpsp.S
index 6c1a9a217887..73613b5f1ee5 100644
--- a/arch/m68k/ifpsp060/src/fpsp.S
+++ b/arch/m68k/ifpsp060/src/fpsp.S
@@ -753,7 +753,7 @@ fovfl_ovfl_on:
 
         bra.l           _real_ovfl
 
-# overflow occurred but is disabled. meanwhile, inexact is enabled. therefore,
+# overflow occurred but is disabled. meanwhile, inexact is enabled. Therefore,
 # we must jump to real_inex().
 fovfl_inex_on:
 
@@ -1015,7 +1015,7 @@ funfl_unfl_on2:
 
         bra.l           _real_unfl
 
-# undeflow occurred but is disabled. meanwhile, inexact is enabled. therefore,
+# underflow occurred but is disabled. meanwhile, inexact is enabled. Therefore,
 # we must jump to real_inex().
 funfl_inex_on:
 
@@ -2963,7 +2963,7 @@ iea_disabled:
 
         tst.w           %d0                     # is instr fmovm?
         bmi.b           iea_dis_fmovm           # yes
-# instruction is using an extended precision immediate operand. therefore,
+# instruction is using an extended precision immediate operand. Therefore,
 # the total instruction length is 16 bytes.
 iea_dis_immed:
         mov.l           &0x10,%d0               # 16 bytes of instruction
@@ -9624,7 +9624,7 @@ sok_dnrm:
         bge.b           sok_norm2               # thank goodness no
 
 # the multiply factor that we're trying to create should be a denorm
-# for the multiply to work. therefore, we're going to actually do a
+# for the multiply to work. Therefore, we're going to actually do a
 # multiply with a denorm which will cause an unimplemented data type
 # exception to be put into the machine which will be caught and corrected
 # later. we don't do this with the DENORMs above because this method
@@ -12216,7 +12216,7 @@ fin_sd_unfl_dis:
 
 #
 # operand will underflow AND underflow or inexact is enabled.
-# therefore, we must return the result rounded to extended precision.
+# Therefore, we must return the result rounded to extended precision.
 #
 fin_sd_unfl_ena:
         mov.l           FP_SCR0_HI(%a6),FP_SCR1_HI(%a6)
@@ -12746,7 +12746,7 @@ fdiv_zero_load_p:
 
 #
 # The destination was In Range and the source was a ZERO. The result,
-# therefore, is an INF w/ the proper sign.
+# Therefore, is an INF w/ the proper sign.
 # So, determine the sign and return a new INF (w/ the j-bit cleared).
 #
         global          fdiv_inf_load           # global for fsgldiv
@@ -12996,7 +12996,7 @@ fneg_sd_unfl_dis:
 
 #
 # operand will underflow AND underflow is enabled.
-# therefore, we must return the result rounded to extended precision.
+# Therefore, we must return the result rounded to extended precision.
 #
 fneg_sd_unfl_ena:
         mov.l           FP_SCR0_HI(%a6),FP_SCR1_HI(%a6)
@@ -13611,7 +13611,7 @@ fabs_sd_unfl_dis:
 
 #
 # operand will underflow AND underflow is enabled.
-# therefore, we must return the result rounded to extended precision.
+# Therefore, we must return the result rounded to extended precision.
 #
 fabs_sd_unfl_ena:
         mov.l           FP_SCR0_HI(%a6),FP_SCR1_HI(%a6)
@@ -14973,7 +14973,7 @@ fadd_zero_2:
 
 #
 # the ZEROes have opposite signs:
-# - therefore, we return +ZERO if the rounding modes are RN,RZ, or RP.
+# - Therefore, we return +ZERO if the rounding modes are RN,RZ, or RP.
 # - -ZERO is returned in the case of RM.
 #
 fadd_zero_2_chk_rm:
@@ -15425,7 +15425,7 @@ fsub_zero_2:
 
 #
 # the ZEROes have the same signs:
-# - therefore, we return +ZERO if the rounding mode is RN,RZ, or RP
+# - Therefore, we return +ZERO if the rounding mode is RN,RZ, or RP
 # - -ZERO is returned in the case of RM.
 #
 fsub_zero_2_chk_rm:
@@ -15693,7 +15693,7 @@ fsqrt_sd_unfl_dis:
 
 #
 # operand will underflow AND underflow is enabled.
-# therefore, we must return the result rounded to extended precision.
+# Therefore, we must return the result rounded to extended precision.
 #
 fsqrt_sd_unfl_ena:
         mov.l           FP_SCR0_HI(%a6),FP_SCR1_HI(%a6)
@@ -21000,7 +21000,7 @@ fout_pack_type:
         tst.l           %d0
         bne.b           fout_pack_set
 # "mantissa" is all zero which means that the answer is zero. but, the '040
-# algorithm allows the exponent to be non-zero. the 881/2 do not. therefore,
+# algorithm allows the exponent to be non-zero. the 881/2 do not. Therefore,
 # if the mantissa is zero, I will zero the exponent, too.
 # the question now is whether the exponents sign bit is allowed to be non-zero
 # for a zero, also...
@@ -21743,7 +21743,7 @@ denorm_set_stky:
         rts
 
 #                                                                       #
-# dnrm_lp(): normalize exponent/mantissa to specified threshhold        #
+# dnrm_lp(): normalize exponent/mantissa to specified threshold         #
 #                                                                       #
 # INPUT:                                                                #
 #       %a0        : points to the operand to be denormalized           #
@@ -22402,7 +22402,7 @@ unnorm_shift:
         bgt.b           unnorm_nrm_zero         # yes; denorm only until exp = 0
 
 #
-# exponent would not go < 0. therefore, number stays normalized
+# exponent would not go < 0. Therefore, number stays normalized
 #
         sub.w           %d0, %d1                # shift exponent value
         mov.w           FTEMP_EX(%a0), %d0      # load old exponent
diff --git a/arch/m68k/ifpsp060/src/pfpsp.S b/arch/m68k/ifpsp060/src/pfpsp.S
index 51b9f7d879dd..e71ba0ab013c 100644
--- a/arch/m68k/ifpsp060/src/pfpsp.S
+++ b/arch/m68k/ifpsp060/src/pfpsp.S
@@ -752,7 +752,7 @@ fovfl_ovfl_on:
 
         bra.l           _real_ovfl
 
-# overflow occurred but is disabled. meanwhile, inexact is enabled. therefore,
+# overflow occurred but is disabled. meanwhile, inexact is enabled. Therefore,
 # we must jump to real_inex().
 fovfl_inex_on:
 
@@ -1014,7 +1014,7 @@ funfl_unfl_on2:
 
         bra.l           _real_unfl
 
-# undeflow occurred but is disabled. meanwhile, inexact is enabled. therefore,
+# underflow occurred but is disabled. meanwhile, inexact is enabled. Therefore,
 # we must jump to real_inex().
 funfl_inex_on:
 
@@ -2962,7 +2962,7 @@ iea_disabled:
 
         tst.w           %d0                     # is instr fmovm?
         bmi.b           iea_dis_fmovm           # yes
-# instruction is using an extended precision immediate operand. therefore,
+# instruction is using an extended precision immediate operand. Therefore,
 # the total instruction length is 16 bytes.
 iea_dis_immed:
         mov.l           &0x10,%d0               # 16 bytes of instruction
@@ -5865,7 +5865,7 @@ denorm_set_stky:
         rts
 
 #                                                                       #
-# dnrm_lp(): normalize exponent/mantissa to specified threshhold        #
+# dnrm_lp(): normalize exponent/mantissa to specified threshold         #
 #                                                                       #
 # INPUT:                                                                #
 #       %a0        : points to the operand to be denormalized           #
@@ -6524,7 +6524,7 @@ unnorm_shift:
         bgt.b           unnorm_nrm_zero         # yes; denorm only until exp = 0
 
 #
-# exponent would not go < 0. therefore, number stays normalized
+# exponent would not go < 0. Therefore, number stays normalized
 #
         sub.w           %d0, %d1                # shift exponent value
         mov.w           FTEMP_EX(%a0), %d0      # load old exponent
@@ -7901,7 +7901,7 @@ fout_pack_type:
         tst.l           %d0
         bne.b           fout_pack_set
 # "mantissa" is all zero which means that the answer is zero. but, the '040
-# algorithm allows the exponent to be non-zero. the 881/2 do not. therefore,
+# algorithm allows the exponent to be non-zero. the 881/2 do not. Therefore,
 # if the mantissa is zero, I will zero the exponent, too.
 # the question now is whether the exponents sign bit is allowed to be non-zero
 # for a zero, also...
@@ -8647,7 +8647,7 @@ fin_sd_unfl_dis:
 
 #
 # operand will underflow AND underflow or inexact is enabled.
-# therefore, we must return the result rounded to extended precision.
+# Therefore, we must return the result rounded to extended precision.
 #
 fin_sd_unfl_ena:
         mov.l           FP_SCR0_HI(%a6),FP_SCR1_HI(%a6)
@@ -9177,7 +9177,7 @@ fdiv_zero_load_p:
 
 #
 # The destination was In Range and the source was a ZERO. The result,
-# therefore, is an INF w/ the proper sign.
+# Therefore, is an INF w/ the proper sign.
 # So, determine the sign and return a new INF (w/ the j-bit cleared).
 #
         global          fdiv_inf_load           # global for fsgldiv
@@ -9427,7 +9427,7 @@ fneg_sd_unfl_dis:
 
 #
 # operand will underflow AND underflow is enabled.
-# therefore, we must return the result rounded to extended precision.
+# Therefore, we must return the result rounded to extended precision.
 #
 fneg_sd_unfl_ena:
         mov.l           FP_SCR0_HI(%a6),FP_SCR1_HI(%a6)
@@ -10042,7 +10042,7 @@ fabs_sd_unfl_dis:
 
 #
 # operand will underflow AND underflow is enabled.
-# therefore, we must return the result rounded to extended precision.
+# Therefore, we must return the result rounded to extended precision.
 #
 fabs_sd_unfl_ena:
         mov.l           FP_SCR0_HI(%a6),FP_SCR1_HI(%a6)
@@ -11404,7 +11404,7 @@ fadd_zero_2:
 
 #
 # the ZEROes have opposite signs:
-# - therefore, we return +ZERO if the rounding modes are RN,RZ, or RP.
+# - Therefore, we return +ZERO if the rounding modes are RN,RZ, or RP.
 # - -ZERO is returned in the case of RM.
 #
 fadd_zero_2_chk_rm:
@@ -11856,7 +11856,7 @@ fsub_zero_2:
 
 #
 # the ZEROes have the same signs:
-# - therefore, we return +ZERO if the rounding mode is RN,RZ, or RP
+# - Therefore, we return +ZERO if the rounding mode is RN,RZ, or RP
 # - -ZERO is returned in the case of RM.
 #
 fsub_zero_2_chk_rm:
@@ -12124,7 +12124,7 @@ fsqrt_sd_unfl_dis:
 
 #
 # operand will underflow AND underflow is enabled.
-# therefore, we must return the result rounded to extended precision.
+# Therefore, we must return the result rounded to extended precision.
 #
 fsqrt_sd_unfl_ena:
         mov.l           FP_SCR0_HI(%a6),FP_SCR1_HI(%a6)
diff --git a/arch/m68k/include/asm/asm-offsets.h b/arch/m68k/include/asm/asm-offsets.h
new file mode 100644
index 000000000000..d370ee36a182
--- /dev/null
+++ b/arch/m68k/include/asm/asm-offsets.h
@@ -0,0 +1 @@
+#include <generated/asm-offsets.h>
diff --git a/arch/m68k/include/asm/atomic_mm.h b/arch/m68k/include/asm/atomic_mm.h
index 88b7af20a996..d9d2ed647435 100644
--- a/arch/m68k/include/asm/atomic_mm.h
+++ b/arch/m68k/include/asm/atomic_mm.h
@@ -148,14 +148,18 @@ static inline int atomic_xchg(atomic_t *v, int new)
 static inline int atomic_sub_and_test(int i, atomic_t *v)
 {
         char c;
-        __asm__ __volatile__("subl %2,%1; seq %0" : "=d" (c), "+m" (*v): "g" (i));
+        __asm__ __volatile__("subl %2,%1; seq %0"
+                             : "=d" (c), "+m" (*v)
+                             : "id" (i));
         return c != 0;
 }
 
 static inline int atomic_add_negative(int i, atomic_t *v)
 {
         char c;
-        __asm__ __volatile__("addl %2,%1; smi %0" : "=d" (c), "+m" (*v): "g" (i));
+        __asm__ __volatile__("addl %2,%1; smi %0"
+                             : "=d" (c), "+m" (*v)
+                             : "id" (i));
         return c != 0;
 }
 
diff --git a/arch/m68k/include/asm/bootinfo.h b/arch/m68k/include/asm/bootinfo.h
index fb8a06b9ab6a..67e7a78ad96b 100644
--- a/arch/m68k/include/asm/bootinfo.h
+++ b/arch/m68k/include/asm/bootinfo.h
@@ -145,7 +145,7 @@ struct bi_record {
 
     /*
      *  Macintosh hardware profile data - unused, see macintosh.h for
-     *  resonable type values
+     *  reasonable type values
      */
 
 #define BI_MAC_VIA1BASE         0x8010  /* Mac VIA1 base address (always present) */
diff --git a/arch/m68k/include/asm/cacheflush_mm.h b/arch/m68k/include/asm/cacheflush_mm.h
index 16bf375fdbe1..73de7c89d8e0 100644
--- a/arch/m68k/include/asm/cacheflush_mm.h
+++ b/arch/m68k/include/asm/cacheflush_mm.h
@@ -128,6 +128,7 @@ static inline void __flush_page_to_ram(void *vaddr)
         }
 }
 
+#define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1
 #define flush_dcache_page(page)         __flush_page_to_ram(page_address(page))
 #define flush_dcache_mmap_lock(mapping)         do { } while (0)
 #define flush_dcache_mmap_unlock(mapping)       do { } while (0)
diff --git a/arch/m68k/include/asm/cacheflush_no.h b/arch/m68k/include/asm/cacheflush_no.h
index c65f00a94553..89f195656be7 100644
--- a/arch/m68k/include/asm/cacheflush_no.h
+++ b/arch/m68k/include/asm/cacheflush_no.h
@@ -12,6 +12,7 @@
 #define flush_cache_range(vma, start, end)      __flush_cache_all()
 #define flush_cache_page(vma, vmaddr)           do { } while (0)
 #define flush_dcache_range(start,len)           __flush_cache_all()
+#define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 0
 #define flush_dcache_page(page)                 do { } while (0)
 #define flush_dcache_mmap_lock(mapping)         do { } while (0)
 #define flush_dcache_mmap_unlock(mapping)       do { } while (0)
diff --git a/arch/m68k/include/asm/elf.h b/arch/m68k/include/asm/elf.h
index 0b0f49eb876b..01c193d91412 100644
--- a/arch/m68k/include/asm/elf.h
+++ b/arch/m68k/include/asm/elf.h
@@ -59,7 +59,6 @@ typedef struct user_m68kfp_struct elf_fpregset_t;
    is actually used on ASV.  */
 #define ELF_PLAT_INIT(_r, load_addr)    _r->a1 = 0
 
-#define USE_ELF_CORE_DUMP
 #ifndef CONFIG_SUN3
 #define ELF_EXEC_PAGESIZE       4096
 #else
diff --git a/arch/m68k/include/asm/fbio.h b/arch/m68k/include/asm/fbio.h
index b9215a0907d3..0a21da87f7d6 100644
--- a/arch/m68k/include/asm/fbio.h
+++ b/arch/m68k/include/asm/fbio.h
@@ -173,7 +173,7 @@ struct mdi_cfginfo {
         int     mdi_ncluts;     /* Number of implemented CLUTs in this MDI */
         int     mdi_type;       /* FBTYPE name */
         int     mdi_height;     /* height */
-        int     mdi_width;      /* widht */
+        int     mdi_width;      /* width */
         int     mdi_size;       /* available ram */
         int     mdi_mode;       /* 8bpp, 16bpp or 32bpp */
         int     mdi_pixfreq;    /* pixel clock (from PROM) */
diff --git a/arch/m68k/include/asm/io_no.h b/arch/m68k/include/asm/io_no.h
index 7f57436ec18f..6e2413e518cb 100644
--- a/arch/m68k/include/asm/io_no.h
+++ b/arch/m68k/include/asm/io_no.h
@@ -3,6 +3,7 @@
 
 #ifdef __KERNEL__
 
+#include <asm/virtconvert.h>
 
 /*
  * These are for ISA/PCI shared memory _only_ and should never be used
@@ -15,7 +16,7 @@
  * memory location directly.
  */
 /* ++roman: The assignments to temp. vars avoid that gcc sometimes generates
- * two accesses to memory, which may be undesireable for some devices.
+ * two accesses to memory, which may be undesirable for some devices.
  */
 
 /*
@@ -165,19 +166,6 @@ static inline void *ioremap_fullcache(unsigned long physaddr, unsigned long size
 
 extern void iounmap(void *addr);
 
-/* Pages to physical address... */
-#define page_to_phys(page)      ((page - mem_map) << PAGE_SHIFT)
-#define page_to_bus(page)       ((page - mem_map) << PAGE_SHIFT)
-
-/*
- * Macros used for converting between virtual and physical mappings.
- */
-#define phys_to_virt(vaddr)     ((void *) (vaddr))
-#define virt_to_phys(vaddr)     ((unsigned long) (vaddr))
-
-#define virt_to_bus virt_to_phys
-#define bus_to_virt phys_to_virt
-
 /*
  * Convert a physical pointer to a virtual kernel pointer for /dev/mem
  * access
diff --git a/arch/m68k/include/asm/machw.h b/arch/m68k/include/asm/machw.h
index 2b4de0c2ce4a..a22095164927 100644
--- a/arch/m68k/include/asm/machw.h
+++ b/arch/m68k/include/asm/machw.h
@@ -21,29 +21,4 @@
 #define VIDEOMEMSIZE    (4096*1024)
 #define VIDEOMEMMASK    (-4096*1024)
 
-#ifndef __ASSEMBLY__
-
-#include <linux/types.h>
-
-#if 0
-/*
-** SCC Z8530
-*/
-
-#define MAC_SCC_BAS (0x50F04000)
-struct MAC_SCC
- {
-  u_char cha_a_ctrl;
-  u_char char_dummy1;
-  u_char cha_a_data;
-  u_char char_dummy2;
-  u_char cha_b_ctrl;
-  u_char char_dummy3;
-  u_char cha_b_data;
- };
-# define mac_scc ((*(volatile struct SCC*)MAC_SCC_BAS))
-#endif
-
-#endif /* __ASSEMBLY__ */
-
 #endif /* linux/machw.h */
diff --git a/arch/m68k/include/asm/macints.h b/arch/m68k/include/asm/macints.h
index 679c48ab4407..ebe1b70fe90c 100644
--- a/arch/m68k/include/asm/macints.h
+++ b/arch/m68k/include/asm/macints.h
@@ -37,7 +37,6 @@
 
 #define VIA1_SOURCE_BASE        8
 #define VIA2_SOURCE_BASE        16
-#define MAC_SCC_SOURCE_BASE     24
 #define PSC3_SOURCE_BASE        24
 #define PSC4_SOURCE_BASE        32
 #define PSC5_SOURCE_BASE        40
@@ -96,26 +95,12 @@
 #define IRQ_PSC3_2        (26)
 #define IRQ_PSC3_3        (27)
 
-/* Level 4 (SCC) interrupts */
-#define IRQ_SCC              (32)
-#define IRQ_SCCA             (33)
-#define IRQ_SCCB             (34)
-#if 0 /* FIXME: are there multiple interrupt conditions on the SCC ?? */
-/* SCC interrupts */
-#define IRQ_SCCB_TX          (32)
-#define IRQ_SCCB_STAT        (33)
-#define IRQ_SCCB_RX          (34)
-#define IRQ_SCCB_SPCOND      (35)
-#define IRQ_SCCA_TX          (36)
-#define IRQ_SCCA_STAT        (37)
-#define IRQ_SCCA_RX          (38)
-#define IRQ_SCCA_SPCOND      (39)
-#endif
-
 /* Level 4 (PSC, AV Macs only) interrupts */
 #define IRQ_PSC4_0        (32)
 #define IRQ_PSC4_1        (33)
+#define IRQ_MAC_SCC_A     IRQ_PSC4_1
 #define IRQ_PSC4_2        (34)
+#define IRQ_MAC_SCC_B     IRQ_PSC4_2
 #define IRQ_PSC4_3        (35)
 #define IRQ_MAC_MACE_DMA  IRQ_PSC4_3
 
@@ -146,6 +131,9 @@
 #define IRQ_BABOON_2      (66)
 #define IRQ_BABOON_3      (67)
 
+/* On non-PSC machines, the serial ports share an IRQ */
+#define IRQ_MAC_SCC       IRQ_AUTO_4
+
 #define SLOT2IRQ(x)       (x + 47)
 #define IRQ2SLOT(x)       (x - 47)
 
diff --git a/arch/m68k/include/asm/mcfuart.h b/arch/m68k/include/asm/mcfuart.h
index ef2293873612..01a8716c5fc5 100644
--- a/arch/m68k/include/asm/mcfuart.h
+++ b/arch/m68k/include/asm/mcfuart.h
@@ -212,5 +212,10 @@ struct mcf_platform_uart {
 #define MCFUART_URF_RXS         0xc0            /* Receiver status */
 #endif
 
+#if defined(CONFIG_M5272)
+#define MCFUART_TXFIFOSIZE      25
+#else
+#define MCFUART_TXFIFOSIZE      1
+#endif
 /****************************************************************************/
 #endif  /* mcfuart_h */
diff --git a/arch/m68k/include/asm/page_no.h b/arch/m68k/include/asm/page_no.h
index 1f31b060cc8d..8029a33e03c3 100644
--- a/arch/m68k/include/asm/page_no.h
+++ b/arch/m68k/include/asm/page_no.h
@@ -56,8 +56,8 @@ extern unsigned long memory_end;
 
 #ifndef __ASSEMBLY__
 
-#define __pa(vaddr)             virt_to_phys((void *)(vaddr))
-#define __va(paddr)             phys_to_virt((unsigned long)(paddr))
+#define __pa(vaddr)             ((unsigned long)(vaddr))
+#define __va(paddr)             ((void *)(paddr))
 
 #define virt_to_pfn(kaddr)      (__pa(kaddr) >> PAGE_SHIFT)
 #define pfn_to_virt(pfn)        __va((pfn) << PAGE_SHIFT)
diff --git a/arch/m68k/include/asm/pgtable_mm.h b/arch/m68k/include/asm/pgtable_mm.h
index fe60e1abaee8..87174c904d2b 100644
--- a/arch/m68k/include/asm/pgtable_mm.h
+++ b/arch/m68k/include/asm/pgtable_mm.h
@@ -83,9 +83,9 @@
 #define VMALLOC_START (((unsigned long) high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
 #define VMALLOC_END KMAP_START
 #else
-extern unsigned long vmalloc_end;
+extern unsigned long m68k_vmalloc_end;
 #define VMALLOC_START 0x0f800000
-#define VMALLOC_END vmalloc_end
+#define VMALLOC_END m68k_vmalloc_end
 #endif /* CONFIG_SUN3 */
 
 /* zero page used for uninitialized stuff */
@@ -115,7 +115,7 @@ extern void kernel_set_cachemode(void *addr, unsigned long size, int cmode);
  * they are updated on demand.
  */
 static inline void update_mmu_cache(struct vm_area_struct *vma,
-                                    unsigned long address, pte_t pte)
+                                    unsigned long address, pte_t *ptep)
 {
 }
 
diff --git a/arch/m68k/include/asm/processor.h b/arch/m68k/include/asm/processor.h
index 74fd674b15ad..cbd3d4751dd2 100644
--- a/arch/m68k/include/asm/processor.h
+++ b/arch/m68k/include/asm/processor.h
@@ -165,6 +165,8 @@ unsigned long get_wchan(struct task_struct *p);
         eip; })
 #define KSTK_ESP(tsk)   ((tsk) == current ? rdusp() : (tsk)->thread.usp)
 
+#define task_pt_regs(tsk)       ((struct pt_regs *) ((tsk)->thread.esp0))
+
 #define cpu_relax()     barrier()
 
 #endif
diff --git a/arch/m68k/include/asm/ptrace.h b/arch/m68k/include/asm/ptrace.h
index 8c9194b98548..6e6e3ac1d913 100644
--- a/arch/m68k/include/asm/ptrace.h
+++ b/arch/m68k/include/asm/ptrace.h
@@ -71,6 +71,10 @@ struct switch_stack {
 #define PTRACE_GETFPREGS          14
 #define PTRACE_SETFPREGS          15
 
+#define PTRACE_GET_THREAD_AREA    25
+
+#define PTRACE_SINGLEBLOCK      33      /* resume execution until next branch */
+
 #ifdef __KERNEL__
 
 #ifndef PS_S
@@ -82,6 +86,13 @@ struct switch_stack {
 #define instruction_pointer(regs) ((regs)->pc)
 #define profile_pc(regs) instruction_pointer(regs)
 extern void show_regs(struct pt_regs *);
+
+#define arch_has_single_step()  (1)
+
+#ifdef CONFIG_MMU
+#define arch_has_block_step()   (1)
+#endif
+
 #endif /* __KERNEL__ */
 #endif /* __ASSEMBLY__ */
 #endif /* _M68K_PTRACE_H */
diff --git a/arch/m68k/include/asm/sigcontext.h b/arch/m68k/include/asm/sigcontext.h
index 523db2a51cf3..a29dd74a17cb 100644
--- a/arch/m68k/include/asm/sigcontext.h
+++ b/arch/m68k/include/asm/sigcontext.h
@@ -15,7 +15,11 @@ struct sigcontext {
         unsigned long  sc_pc;
         unsigned short sc_formatvec;
 #ifndef __uClinux__
+# ifdef __mcoldfire__
+        unsigned long  sc_fpregs[2][2]; /* room for two fp registers */
+# else
         unsigned long  sc_fpregs[2*3];  /* room for two fp registers */
+# endif
         unsigned long  sc_fpcntl[3];
         unsigned char  sc_fpstate[216];
 #endif
diff --git a/arch/m68k/include/asm/siginfo.h b/arch/m68k/include/asm/siginfo.h
index ca7dde8fd223..851d3d784b53 100644
--- a/arch/m68k/include/asm/siginfo.h
+++ b/arch/m68k/include/asm/siginfo.h
@@ -1,97 +1,6 @@
 #ifndef _M68K_SIGINFO_H
 #define _M68K_SIGINFO_H
 
-#ifndef __uClinux__
-#define HAVE_ARCH_SIGINFO_T
-#define HAVE_ARCH_COPY_SIGINFO
-#endif
-
 #include <asm-generic/siginfo.h>
 
-#ifndef __uClinux__
-
-typedef struct siginfo {
-        int si_signo;
-        int si_errno;
-        int si_code;
-
-        union {
-                int _pad[SI_PAD_SIZE];
-
-                /* kill() */
-                struct {
-                        __kernel_pid_t _pid;    /* sender's pid */
-                        __kernel_uid_t _uid;    /* backwards compatibility */
-                        __kernel_uid32_t _uid32; /* sender's uid */
-                } _kill;
-
-                /* POSIX.1b timers */
-                struct {
-                        timer_t _tid;           /* timer id */
-                        int _overrun;           /* overrun count */
-                        char _pad[sizeof( __ARCH_SI_UID_T) - sizeof(int)];
-                        sigval_t _sigval;       /* same as below */
-                        int _sys_private;       /* not to be passed to user */
-                } _timer;
-
-                /* POSIX.1b signals */
-                struct {
-                        __kernel_pid_t _pid;    /* sender's pid */
-                        __kernel_uid_t _uid;    /* backwards compatibility */
-                        sigval_t _sigval;
-                        __kernel_uid32_t _uid32; /* sender's uid */
-                } _rt;
-
-                /* SIGCHLD */
-                struct {
-                        __kernel_pid_t _pid;    /* which child */
-                        __kernel_uid_t _uid;    /* backwards compatibility */
-                        int _status;            /* exit code */
-                        clock_t _utime;
-                        clock_t _stime;
-                        __kernel_uid32_t _uid32; /* sender's uid */
-                } _sigchld;
-
-                /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
-                struct {
-                        void *_addr; /* faulting insn/memory ref. */
-                } _sigfault;
-
-                /* SIGPOLL */
-                struct {
-                        int _band;      /* POLL_IN, POLL_OUT, POLL_MSG */
-                        int _fd;
-                } _sigpoll;
-        } _sifields;
-} siginfo_t;
-
-#define UID16_SIGINFO_COMPAT_NEEDED
-
-/*
- * How these fields are to be accessed.
- */
-#undef si_uid
-#ifdef __KERNEL__
-#define si_uid          _sifields._kill._uid32
-#define si_uid16        _sifields._kill._uid
-#else
-#define si_uid          _sifields._kill._uid
-#endif
-
-#ifdef __KERNEL__
-
-#include <linux/string.h>
-
-static inline void copy_siginfo(struct siginfo *to, struct siginfo *from)
-{
-        if (from->si_code < 0)
-                memcpy(to, from, sizeof(*to));
-        else
-                /* _sigchld is currently the largest know union member */
-                memcpy(to, from, 3*sizeof(int) + sizeof(from->_sifields._sigchld));
-}
-
-#endif /* __KERNEL__ */
-#endif /* !__uClinux__ */
-
 #endif
diff --git a/arch/m68k/include/asm/socket.h b/arch/m68k/include/asm/socket.h
index eee01cce921b..9bf49c87d954 100644
--- a/arch/m68k/include/asm/socket.h
+++ b/arch/m68k/include/asm/socket.h
@@ -60,4 +60,6 @@
 #define SO_PROTOCOL             38
 #define SO_DOMAIN               39
 
+#define SO_RXQ_OVFL             40
+
 #endif /* _ASM_SOCKET_H */
diff --git a/arch/m68k/include/asm/swab.h b/arch/m68k/include/asm/swab.h
index 5b754aace744..b7b37a40defc 100644
--- a/arch/m68k/include/asm/swab.h
+++ b/arch/m68k/include/asm/swab.h
@@ -14,7 +14,7 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 val)
 }
 
 #define __arch_swab32 __arch_swab32
-#elif !defined(__uClinux__)
+#elif !defined(__mcoldfire__)
 
 static inline __attribute_const__ __u32 __arch_swab32(__u32 val)
 {
diff --git a/arch/m68k/include/asm/thread_info_mm.h b/arch/m68k/include/asm/thread_info_mm.h
index b6da3882be9b..67266c683453 100644
--- a/arch/m68k/include/asm/thread_info_mm.h
+++ b/arch/m68k/include/asm/thread_info_mm.h
@@ -4,18 +4,22 @@
 #ifndef ASM_OFFSETS_C
 #include <asm/asm-offsets.h>
 #endif
-#include <asm/current.h>
 #include <asm/types.h>
 #include <asm/page.h>
 
+#ifndef __ASSEMBLY__
+#include <asm/current.h>
+
 struct thread_info {
         struct task_struct      *task;          /* main task structure */
         unsigned long           flags;
         struct exec_domain      *exec_domain;   /* execution domain */
         int                     preempt_count;  /* 0 => preemptable, <0 => BUG */
         __u32 cpu; /* should always be 0 on m68k */
+        unsigned long           tp_value;       /* thread pointer */
         struct restart_block    restart_block;
 };
+#endif /* __ASSEMBLY__ */
 
 #define PREEMPT_ACTIVE          0x4000000
 
diff --git a/arch/m68k/include/asm/thread_info_no.h b/arch/m68k/include/asm/thread_info_no.h
index c2bde5e24b0b..884776f686ca 100644
--- a/arch/m68k/include/asm/thread_info_no.h
+++ b/arch/m68k/include/asm/thread_info_no.h
@@ -12,8 +12,6 @@
 
 #ifdef __KERNEL__
 
-#ifndef __ASSEMBLY__
-
 /*
  * Size of kernel stack for each process. This must be a power of 2...
  */
@@ -28,6 +26,8 @@
  */
 #define THREAD_SIZE (PAGE_SIZE<<THREAD_SIZE_ORDER)
 
+#ifndef __ASSEMBLY__
+
 /*
  * low level task data.
  */
@@ -37,6 +37,7 @@ struct thread_info {
         unsigned long      flags;               /* low level flags */
         int                cpu;                 /* cpu we're on */
         int                preempt_count;       /* 0 => preemptable, <0 => BUG */
+        unsigned long      tp_value;            /* thread pointer */
         struct restart_block restart_block;
 };
 
diff --git a/arch/m68k/include/asm/ucontext.h b/arch/m68k/include/asm/ucontext.h
index e4e22669edc0..00dcc5176c57 100644
--- a/arch/m68k/include/asm/ucontext.h
+++ b/arch/m68k/include/asm/ucontext.h
@@ -7,7 +7,11 @@ typedef greg_t gregset_t[NGREG];
 
 typedef struct fpregset {
         int f_fpcntl[3];
+#ifdef __mcoldfire__
+        int f_fpregs[8][2];
+#else
         int f_fpregs[8*3];
+#endif
 } fpregset_t;
 
 struct mcontext {
diff --git a/arch/m68k/include/asm/unistd.h b/arch/m68k/include/asm/unistd.h
index 48b87f5ced50..60b15d0aa072 100644
--- a/arch/m68k/include/asm/unistd.h
+++ b/arch/m68k/include/asm/unistd.h
@@ -336,10 +336,14 @@
 #define __NR_pwritev            330
 #define __NR_rt_tgsigqueueinfo  331
 #define __NR_perf_event_open    332
+#define __NR_get_thread_area    333
+#define __NR_set_thread_area    334
+#define __NR_atomic_cmpxchg_32  335
+#define __NR_atomic_barrier     336
 
 #ifdef __KERNEL__
 
-#define NR_syscalls             333
+#define NR_syscalls             337
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
@@ -347,6 +351,7 @@
 #define __ARCH_WANT_STAT64
 #define __ARCH_WANT_SYS_ALARM
 #define __ARCH_WANT_SYS_GETHOSTNAME
+#define __ARCH_WANT_SYS_IPC
 #define __ARCH_WANT_SYS_PAUSE
 #define __ARCH_WANT_SYS_SGETMASK
 #define __ARCH_WANT_SYS_SIGNAL
@@ -359,6 +364,8 @@
 #define __ARCH_WANT_SYS_LLSEEK
 #define __ARCH_WANT_SYS_NICE
 #define __ARCH_WANT_SYS_OLD_GETRLIMIT
+#define __ARCH_WANT_SYS_OLD_MMAP
+#define __ARCH_WANT_SYS_OLD_SELECT
 #define __ARCH_WANT_SYS_OLDUMOUNT
 #define __ARCH_WANT_SYS_SIGPENDING
 #define __ARCH_WANT_SYS_SIGPROCMASK
diff --git a/arch/m68k/include/asm/virtconvert.h b/arch/m68k/include/asm/virtconvert.h
index 22ab05c9c52b..f35229b8651d 100644
--- a/arch/m68k/include/asm/virtconvert.h
+++ b/arch/m68k/include/asm/virtconvert.h
@@ -26,16 +26,15 @@ static inline void *phys_to_virt(unsigned long address)
 }
 
 /* Permanent address of a page. */
+#ifdef CONFIG_MMU
 #ifdef CONFIG_SINGLE_MEMORY_CHUNK
 #define page_to_phys(page) \
         __pa(PAGE_OFFSET + (((page) - pg_data_map[0].node_mem_map) << PAGE_SHIFT))
 #else
-#define page_to_phys(_page) ({                                          \
-        struct page *__page = _page;                                    \
-        struct pglist_data *pgdat;                                      \
-        pgdat = pg_data_table[page_to_nid(__page)];                     \
-        page_to_pfn(__page) << PAGE_SHIFT;                              \
-})
+#define page_to_phys(page)      (page_to_pfn(page) << PAGE_SHIFT)
+#endif
+#else
+#define page_to_phys(page)      (((page) - mem_map) << PAGE_SHIFT)
 #endif
 
 /*
diff --git a/arch/m68k/kernel/dma.c b/arch/m68k/kernel/dma.c
index 2bb4245404d8..4bbb3c2a8880 100644
--- a/arch/m68k/kernel/dma.c
+++ b/arch/m68k/kernel/dma.c
@@ -10,6 +10,7 @@
 #include <linux/device.h>
 #include <linux/kernel.h>
 #include <linux/scatterlist.h>
+#include <linux/slab.h>
 #include <linux/vmalloc.h>
 
 #include <asm/pgalloc.h>
diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S
index c5b33634c980..2391bdff0996 100644
--- a/arch/m68k/kernel/entry.S
+++ b/arch/m68k/kernel/entry.S
@@ -179,7 +179,11 @@ do_signal_return:
         addql   #8,%sp
         RESTORE_SWITCH_STACK
         addql   #4,%sp
-        jbra    resume_userspace
+        tstl    %d0
+        jeq     resume_userspace
+        | when single stepping into handler stop at the first insn
+        btst    #6,%curptr@(TASK_INFO+TINFO_FLAGS+2)
+        jeq     resume_userspace
 
 do_delayed_trace:
         bclr    #7,%sp@(PT_OFF_SR)      | clear trace bit in SR
@@ -506,7 +510,7 @@ sys_call_table:
         .long sys_settimeofday
         .long sys_getgroups16   /* 80 */
         .long sys_setgroups16
-        .long old_select
+        .long sys_old_select
         .long sys_symlink
         .long sys_lstat
         .long sys_readlink      /* 85 */
@@ -514,7 +518,7 @@ sys_call_table:
         .long sys_swapon
         .long sys_reboot
         .long sys_old_readdir
-        .long old_mmap          /* 90 */
+        .long sys_old_mmap      /* 90 */
         .long sys_munmap
         .long sys_truncate
         .long sys_ftruncate
@@ -757,4 +761,8 @@ sys_call_table:
         .long sys_pwritev               /* 330 */
         .long sys_rt_tgsigqueueinfo
         .long sys_perf_event_open
+        .long sys_get_thread_area
+        .long sys_set_thread_area
+        .long sys_atomic_cmpxchg_32     /* 335 */
+        .long sys_atomic_barrier
 
diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S
index 86edb5fbcfc3..ef54128baa0b 100644
--- a/arch/m68k/kernel/head.S
+++ b/arch/m68k/kernel/head.S
@@ -196,7 +196,7 @@
  * for them and trying to understand what they mean.
  *
  * CONFIG_xxx:  These are the obvious machine configuration defines created
- * during configuration.  These are defined in include/linux/autoconf.h.
+ * during configuration.  These are defined in autoconf.h.
  *
  * CONSOLE:     There is support for head.S console in this file.  This
  * console can talk to a Mac frame buffer, but could easily be extrapolated
diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c
index 41230c595a8e..1a6be27cf165 100644
--- a/arch/m68k/kernel/process.c
+++ b/arch/m68k/kernel/process.c
@@ -15,13 +15,13 @@
 #include <linux/sched.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
+#include <linux/slab.h>
 #include <linux/fs.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
 #include <linux/stddef.h>
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
-#include <linux/slab.h>
 #include <linux/user.h>
 #include <linux/reboot.h>
 #include <linux/init_task.h>
@@ -251,6 +251,10 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
 
         p->thread.usp = usp;
         p->thread.ksp = (unsigned long)childstack;
+
+        if (clone_flags & CLONE_SETTLS)
+                task_thread_info(p)->tp_value = regs->d5;
+
         /*
          * Must save the current SFC/DFC value, NOT the value when
          * the parent was last descheduled - RGH  10-08-96
@@ -317,15 +321,12 @@ asmlinkage int sys_execve(char __user *name, char __user * __user *argv, char __
         char * filename;
         struct pt_regs *regs = (struct pt_regs *) &name;
 
-        lock_kernel();
         filename = getname(name);
         error = PTR_ERR(filename);
         if (IS_ERR(filename))
-                goto out;
+                return error;
         error = do_execve(filename, argv, envp, regs);
         putname(filename);
-out:
-        unlock_kernel();
         return error;
 }
 
diff --git a/arch/m68k/kernel/ptrace.c b/arch/m68k/kernel/ptrace.c
index 2075543c2d92..616e59752c29 100644
--- a/arch/m68k/kernel/ptrace.c
+++ b/arch/m68k/kernel/ptrace.c
@@ -35,7 +35,9 @@
 #define SR_MASK 0x001f
 
 /* sets the trace bits. */
-#define TRACE_BITS 0x8000
+#define TRACE_BITS 0xC000
+#define T1_BIT 0x8000
+#define T0_BIT 0x4000
 
 /* Find the stack offset for a register, relative to thread.esp0. */
 #define PT_REG(reg)     ((long)&((struct pt_regs *)0)->reg)
@@ -44,7 +46,7 @@
 /* Mapping from PT_xxx to the stack offset at which the register is
    saved.  Notice that usp has no stack-slot and needs to be treated
    specially (see get_reg/put_reg below). */
-static int regoff[] = {
+static const int regoff[] = {
         [0]     = PT_REG(d1),
         [1]     = PT_REG(d2),
         [2]     = PT_REG(d3),
@@ -79,6 +81,14 @@ static inline long get_reg(struct task_struct *task, int regno)
                 addr = (unsigned long *)(task->thread.esp0 + regoff[regno]);
         else
                 return 0;
+        /* Need to take stkadj into account. */
+        if (regno == PT_SR || regno == PT_PC) {
+                long stkadj = *(long *)(task->thread.esp0 + PT_REG(stkadj));
+                addr = (unsigned long *) ((unsigned long)addr + stkadj);
+                /* The sr is actually a 16 bit register.  */
+                if (regno == PT_SR)
+                        return *(unsigned short *)addr;
+        }
         return *addr;
 }
 
@@ -96,6 +106,16 @@ static inline int put_reg(struct task_struct *task, int regno,
                 addr = (unsigned long *)(task->thread.esp0 + regoff[regno]);
         else
                 return -1;
+        /* Need to take stkadj into account. */
+        if (regno == PT_SR || regno == PT_PC) {
+                long stkadj = *(long *)(task->thread.esp0 + PT_REG(stkadj));
+                addr = (unsigned long *) ((unsigned long)addr + stkadj);
+                /* The sr is actually a 16 bit register.  */
+                if (regno == PT_SR) {
+                        *(unsigned short *)addr = data;
+                        return 0;
+                }
+        }
         *addr = data;
         return 0;
 }
@@ -105,7 +125,7 @@ static inline int put_reg(struct task_struct *task, int regno,
  */
 static inline void singlestep_disable(struct task_struct *child)
 {
-        unsigned long tmp = get_reg(child, PT_SR) & ~(TRACE_BITS << 16);
+        unsigned long tmp = get_reg(child, PT_SR) & ~TRACE_BITS;
         put_reg(child, PT_SR, tmp);
         clear_tsk_thread_flag(child, TIF_DELAYED_TRACE);
 }
@@ -118,18 +138,30 @@ void ptrace_disable(struct task_struct *child)
         singlestep_disable(child);
 }
 
+void user_enable_single_step(struct task_struct *child)
+{
+        unsigned long tmp = get_reg(child, PT_SR) & ~TRACE_BITS;
+        put_reg(child, PT_SR, tmp | T1_BIT);
+        set_tsk_thread_flag(child, TIF_DELAYED_TRACE);
+}
+
+void user_enable_block_step(struct task_struct *child)
+{
+        unsigned long tmp = get_reg(child, PT_SR) & ~TRACE_BITS;
+        put_reg(child, PT_SR, tmp | T0_BIT);
+}
+
+void user_disable_single_step(struct task_struct *child)
+{
+        singlestep_disable(child);
+}
+
 long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 {
         unsigned long tmp;
         int i, ret = 0;
 
         switch (request) {
-        /* when I and D space are separate, these will need to be fixed. */
-        case PTRACE_PEEKTEXT:   /* read word at location addr. */
-        case PTRACE_PEEKDATA:
-                ret = generic_ptrace_peekdata(child, addr, data);
-                break;
-
         /* read the word at location addr in the USER area. */
         case PTRACE_PEEKUSR:
                 if (addr & 3)
@@ -138,8 +170,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 
                 if (addr >= 0 && addr < 19) {
                         tmp = get_reg(child, addr);
-                        if (addr == PT_SR)
-                                tmp >>= 16;
                 } else if (addr >= 21 && addr < 49) {
                         tmp = child->thread.fp[addr - 21];
                         /* Convert internal fpu reg representation
@@ -149,16 +179,10 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                                 tmp = ((tmp & 0xffff0000) << 15) |
                                       ((tmp & 0x0000ffff) << 16);
                 } else
-                        break;
+                        goto out_eio;
                 ret = put_user(tmp, (unsigned long *)data);
                 break;
 
-        /* when I and D space are separate, this will have to be fixed. */
-        case PTRACE_POKETEXT:   /* write the word at location addr. */
-        case PTRACE_POKEDATA:
-                ret = generic_ptrace_pokedata(child, addr, data);
-                break;
-
         case PTRACE_POKEUSR:    /* write the word at location addr in the USER area */
                 if (addr & 3)
                         goto out_eio;
@@ -166,9 +190,9 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 
                 if (addr == PT_SR) {
                         data &= SR_MASK;
-                        data <<= 16;
-                        data |= get_reg(child, PT_SR) & ~(SR_MASK << 16);
-                } else if (addr >= 0 && addr < 19) {
+                        data |= get_reg(child, PT_SR) & ~SR_MASK;
+                }
+                if (addr >= 0 && addr < 19) {
                         if (put_reg(child, addr, data))
                                 goto out_eio;
                 } else if (addr >= 21 && addr < 48) {
@@ -185,52 +209,9 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                         goto out_eio;
                 break;
 
-        case PTRACE_SYSCALL:    /* continue and stop at next (return from) syscall */
-        case PTRACE_CONT:       /* restart after signal. */
-                if (!valid_signal(data))
-                        goto out_eio;
-
-                if (request == PTRACE_SYSCALL)
-                        set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-                else
-                        clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-                child->exit_code = data;
-                singlestep_disable(child);
-                wake_up_process(child);
-                break;
-
-        /*
-         * make the child exit.  Best I can do is send it a sigkill.
-         * perhaps it should be put in the status that it wants to
-         * exit.
-         */
-        case PTRACE_KILL:
-                if (child->exit_state == EXIT_ZOMBIE) /* already dead */
-                        break;
-                child->exit_code = SIGKILL;
-                singlestep_disable(child);
-                wake_up_process(child);
-                break;
-
-        case PTRACE_SINGLESTEP: /* set the trap flag. */
-                if (!valid_signal(data))
-                        goto out_eio;
-
-                clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-                tmp = get_reg(child, PT_SR) | (TRACE_BITS << 16);
-                put_reg(child, PT_SR, tmp);
-                set_tsk_thread_flag(child, TIF_DELAYED_TRACE);
-
-                child->exit_code = data;
-                /* give it a chance to run. */
-                wake_up_process(child);
-                break;
-
         case PTRACE_GETREGS:    /* Get all gp regs from the child. */
                 for (i = 0; i < 19; i++) {
                         tmp = get_reg(child, i);
-                        if (i == PT_SR)
-                                tmp >>= 16;
                         ret = put_user(tmp, (unsigned long *)data);
                         if (ret)
                                 break;
@@ -245,8 +226,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                                 break;
                         if (i == PT_SR) {
                                 tmp &= SR_MASK;
-                                tmp <<= 16;
-                                tmp |= get_reg(child, PT_SR) & ~(SR_MASK << 16);
+                                tmp |= get_reg(child, PT_SR) & ~SR_MASK;
                         }
                         put_reg(child, i, tmp);
                         data += sizeof(long);
@@ -265,6 +245,11 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                         ret = -EFAULT;
                 break;
 
+        case PTRACE_GET_THREAD_AREA:
+                ret = put_user(task_thread_info(child)->tp_value,
+                               (unsigned long __user *)data);
+                break;
+
         default:
                 ret = ptrace_request(child, request, addr, data);
                 break;
diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c
index de2d05ddd86d..4b387538706f 100644
--- a/arch/m68k/kernel/signal.c
+++ b/arch/m68k/kernel/signal.c
@@ -897,10 +897,17 @@ static void setup_rt_frame (int sig, struct k_sigaction *ka, siginfo_t *info,
 
         /* Set up to return from userspace.  */
         err |= __put_user(frame->retcode, &frame->pretcode);
+#ifdef __mcoldfire__
+        /* movel #__NR_rt_sigreturn,d0; trap #0 */
+        err |= __put_user(0x203c0000, (long __user *)(frame->retcode + 0));
+        err |= __put_user(0x00004e40 + (__NR_rt_sigreturn << 16),
+                          (long __user *)(frame->retcode + 4));
+#else
         /* moveq #,d0; notb d0; trap #0 */
         err |= __put_user(0x70004600 + ((__NR_rt_sigreturn ^ 0xff) << 16),
                           (long __user *)(frame->retcode + 0));
         err |= __put_user(0x4e40, (short __user *)(frame->retcode + 4));
+#endif
 
         if (err)
                 goto give_sigsegv;
diff --git a/arch/m68k/kernel/sys_m68k.c b/arch/m68k/kernel/sys_m68k.c
index 7deb402bfc75..77896692eb0a 100644
--- a/arch/m68k/kernel/sys_m68k.c
+++ b/arch/m68k/kernel/sys_m68k.c
@@ -28,215 +28,22 @@
 #include <asm/traps.h>
 #include <asm/page.h>
 #include <asm/unistd.h>
+#include <linux/elf.h>
+#include <asm/tlb.h>
 
-/* common code for old and new mmaps */
-static inline long do_mmap2(
-        unsigned long addr, unsigned long len,
-        unsigned long prot, unsigned long flags,
-        unsigned long fd, unsigned long pgoff)
-{
-        int error = -EBADF;
-        struct file * file = NULL;
-
-        flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-        if (!(flags & MAP_ANONYMOUS)) {
-                file = fget(fd);
-                if (!file)
-                        goto out;
-        }
-
-        down_write(&current->mm->mmap_sem);
-        error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-        up_write(&current->mm->mmap_sem);
-
-        if (file)
-                fput(file);
-out:
-        return error;
-}
+asmlinkage int do_page_fault(struct pt_regs *regs, unsigned long address,
+                             unsigned long error_code);
 
 asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
         unsigned long prot, unsigned long flags,
         unsigned long fd, unsigned long pgoff)
 {
-        return do_mmap2(addr, len, prot, flags, fd, pgoff);
-}
-
-/*
- * Perform the select(nd, in, out, ex, tv) and mmap() system
- * calls. Linux/m68k cloned Linux/i386, which didn't use to be able to
- * handle more than 4 system call parameters, so these system calls
- * used a memory block for parameter passing..
- */
-
-struct mmap_arg_struct {
-        unsigned long addr;
-        unsigned long len;
-        unsigned long prot;
-        unsigned long flags;
-        unsigned long fd;
-        unsigned long offset;
-};
-
-asmlinkage int old_mmap(struct mmap_arg_struct __user *arg)
-{
-        struct mmap_arg_struct a;
-        int error = -EFAULT;
-
-        if (copy_from_user(&a, arg, sizeof(a)))
-                goto out;
-
-        error = -EINVAL;
-        if (a.offset & ~PAGE_MASK)
-                goto out;
-
-        a.flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-
-        error = do_mmap2(a.addr, a.len, a.prot, a.flags, a.fd, a.offset >> PAGE_SHIFT);
-out:
-        return error;
-}
-
-#if 0
-struct mmap_arg_struct64 {
-        __u32 addr;
-        __u32 len;
-        __u32 prot;
-        __u32 flags;
-        __u64 offset; /* 64 bits */
-        __u32 fd;
-};
-
-asmlinkage long sys_mmap64(struct mmap_arg_struct64 *arg)
-{
-        int error = -EFAULT;
-        struct file * file = NULL;
-        struct mmap_arg_struct64 a;
-        unsigned long pgoff;
-
-        if (copy_from_user(&a, arg, sizeof(a)))
-                return -EFAULT;
-
-        if ((long)a.offset & ~PAGE_MASK)
-                return -EINVAL;
-
-        pgoff = a.offset >> PAGE_SHIFT;
-        if ((a.offset >> PAGE_SHIFT) != pgoff)
-                return -EINVAL;
-
-        if (!(a.flags & MAP_ANONYMOUS)) {
-                error = -EBADF;
-                file = fget(a.fd);
-                if (!file)
-                        goto out;
-        }
-        a.flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-
-        down_write(&current->mm->mmap_sem);
-        error = do_mmap_pgoff(file, a.addr, a.len, a.prot, a.flags, pgoff);
-        up_write(&current->mm->mmap_sem);
-        if (file)
-                fput(file);
-out:
-        return error;
-}
-#endif
-
-struct sel_arg_struct {
-        unsigned long n;
-        fd_set __user *inp, *outp, *exp;
-        struct timeval __user *tvp;
-};
-
-asmlinkage int old_select(struct sel_arg_struct __user *arg)
-{
-        struct sel_arg_struct a;
-
-        if (copy_from_user(&a, arg, sizeof(a)))
-                return -EFAULT;
-        /* sys_select() does the appropriate kernel locking */
-        return sys_select(a.n, a.inp, a.outp, a.exp, a.tvp);
-}
-
-/*
- * sys_ipc() is the de-multiplexer for the SysV IPC calls..
- *
- * This is really horribly ugly.
- */
-asmlinkage int sys_ipc (uint call, int first, int second,
-                        int third, void __user *ptr, long fifth)
-{
-        int version, ret;
-
-        version = call >> 16; /* hack for backward compatibility */
-        call &= 0xffff;
-
-        if (call <= SEMCTL)
-                switch (call) {
-                case SEMOP:
-                        return sys_semop (first, ptr, second);
-                case SEMGET:
-                        return sys_semget (first, second, third);
-                case SEMCTL: {
-                        union semun fourth;
-                        if (!ptr)
-                                return -EINVAL;
-                        if (get_user(fourth.__pad, (void __user *__user *) ptr))
-                                return -EFAULT;
-                        return sys_semctl (first, second, third, fourth);
-                        }
-                default:
-                        return -ENOSYS;
-                }
-        if (call <= MSGCTL)
-                switch (call) {
-                case MSGSND:
-                        return sys_msgsnd (first, ptr, second, third);
-                case MSGRCV:
-                        switch (version) {
-                        case 0: {
-                                struct ipc_kludge tmp;
-                                if (!ptr)
-                                        return -EINVAL;
-                                if (copy_from_user (&tmp, ptr, sizeof (tmp)))
-                                        return -EFAULT;
-                                return sys_msgrcv (first, tmp.msgp, second,
-                                                   tmp.msgtyp, third);
-                                }
-                        default:
-                                return sys_msgrcv (first, ptr,
-                                                   second, fifth, third);
-                        }
-                case MSGGET:
-                        return sys_msgget ((key_t) first, second);
-                case MSGCTL:
-                        return sys_msgctl (first, second, ptr);
-                default:
-                        return -ENOSYS;
-                }
-        if (call <= SHMCTL)
-                switch (call) {
-                case SHMAT:
-                        switch (version) {
-                        default: {
-                                ulong raddr;
-                                ret = do_shmat (first, ptr, second, &raddr);
-                                if (ret)
-                                        return ret;
-                                return put_user (raddr, (ulong __user *) third);
-                        }
-                        }
-                case SHMDT:
-                        return sys_shmdt (ptr);
-                case SHMGET:
-                        return sys_shmget (first, second, third);
-                case SHMCTL:
-                        return sys_shmctl (first, second, ptr);
-                default:
-                        return -ENOSYS;
-                }
-
-        return -EINVAL;
+        /*
+         * This is wrong for sun3 - there PAGE_SIZE is 8Kb,
+         * so we need to shift the argument down by 1; m68k mmap64(3)
+         * (in libc) expects the last argument of mmap2 in 4Kb units.
+         */
+        return sys_mmap_pgoff(addr, len, prot, flags, fd, pgoff);
 }
 
 /* Convert virtual (user) address VADDR to physical address PADDR */
@@ -662,3 +469,79 @@ int kernel_execve(const char *filename, char *const argv[], char *const envp[])
                         : "d" (__a), "d" (__b), "d" (__c));
         return __res;
 }
+
+asmlinkage unsigned long sys_get_thread_area(void)
+{
+        return current_thread_info()->tp_value;
+}
+
+asmlinkage int sys_set_thread_area(unsigned long tp)
+{
+        current_thread_info()->tp_value = tp;
+        return 0;
+}
+
+/* This syscall gets its arguments in A0 (mem), D2 (oldval) and
+   D1 (newval).  */
+asmlinkage int
+sys_atomic_cmpxchg_32(unsigned long newval, int oldval, int d3, int d4, int d5,
+                      unsigned long __user * mem)
+{
+        /* This was borrowed from ARM's implementation.  */
+        for (;;) {
+                struct mm_struct *mm = current->mm;
+                pgd_t *pgd;
+                pmd_t *pmd;
+                pte_t *pte;
+                spinlock_t *ptl;
+                unsigned long mem_value;
+
+                down_read(&mm->mmap_sem);
+                pgd = pgd_offset(mm, (unsigned long)mem);
+                if (!pgd_present(*pgd))
+                        goto bad_access;
+                pmd = pmd_offset(pgd, (unsigned long)mem);
+                if (!pmd_present(*pmd))
+                        goto bad_access;
+                pte = pte_offset_map_lock(mm, pmd, (unsigned long)mem, &ptl);
+                if (!pte_present(*pte) || !pte_dirty(*pte)
+                    || !pte_write(*pte)) {
+                        pte_unmap_unlock(pte, ptl);
+                        goto bad_access;
+                }
+
+                mem_value = *mem;
+                if (mem_value == oldval)
+                        *mem = newval;
+
+                pte_unmap_unlock(pte, ptl);
+                up_read(&mm->mmap_sem);
+                return mem_value;
+
+              bad_access:
+                up_read(&mm->mmap_sem);
+                /* This is not necessarily a bad access, we can get here if
+                   a memory we're trying to write to should be copied-on-write.
+                   Make the kernel do the necessary page stuff, then re-iterate.
+                   Simulate a write access fault to do that.  */
+                {
+                        /* The first argument of the function corresponds to
+                           D1, which is the first field of struct pt_regs.  */
+                        struct pt_regs *fp = (struct pt_regs *)&newval;
+
+                        /* '3' is an RMW flag.  */
+                        if (do_page_fault(fp, (unsigned long)mem, 3))
+                                /* If the do_page_fault() failed, we don't
+                                   have anything meaningful to return.
+                                   There should be a SIGSEGV pending for
+                                   the process.  */
+                                return 0xdeadbeef;
+                }
+        }
+}
+
+asmlinkage int sys_atomic_barrier(void)
+{
+        /* no code needed for uniprocs */
+        return 0;
+}
diff --git a/arch/m68k/kernel/vmlinux-std.lds b/arch/m68k/kernel/vmlinux-std.lds
index 47eac19e8f61..878be5f38cad 100644
--- a/arch/m68k/kernel/vmlinux-std.lds
+++ b/arch/m68k/kernel/vmlinux-std.lds
@@ -2,6 +2,7 @@
 
 #include <asm-generic/vmlinux.lds.h>
 #include <asm/page.h>
+#include <asm/thread_info.h>
 
 OUTPUT_FORMAT("elf32-m68k", "elf32-m68k", "elf32-m68k")
 OUTPUT_ARCH(m68k)
@@ -22,73 +23,37 @@ SECTIONS
 
   _etext = .;                   /* End of text section */
 
-  . = ALIGN(16);                /* Exception table */
-  __start___ex_table = .;
-  __ex_table : { *(__ex_table) }
-  __stop___ex_table = .;
+  EXCEPTION_TABLE(16)
 
   RODATA
 
-  .data : {                     /* Data */
-        DATA_DATA
-        CONSTRUCTORS
-        }
+  RW_DATA_SECTION(16, PAGE_SIZE, THREAD_SIZE)
 
-  . = ALIGN(16);
-  .data.cacheline_aligned : { *(.data.cacheline_aligned) }
-
-  .bss : { *(.bss) }            /* BSS */
+  BSS_SECTION(0, 0, 0)
 
   _edata = .;                   /* End of data section */
 
   /* will be freed after init */
   . = ALIGN(PAGE_SIZE);         /* Init code and data */
   __init_begin = .;
-  .init.text : {
-        _sinittext = .;
-        INIT_TEXT
-        _einittext = .;
-  } :data
-  .init.data : { INIT_DATA }
-  . = ALIGN(16);
-  __setup_start = .;
-  .init.setup : { *(.init.setup) }
-  __setup_end = .;
-  __initcall_start = .;
-  .initcall.init : {
-        INITCALLS
-  }
-  __initcall_end = .;
-  __con_initcall_start = .;
-  .con_initcall.init : { *(.con_initcall.init) }
-  __con_initcall_end = .;
+  INIT_TEXT_SECTION(PAGE_SIZE) :data
+  INIT_DATA_SECTION(16)
   .m68k_fixup : {
         __start_fixup = .;
         *(.m68k_fixup)
         __stop_fixup = .;
   }
-  SECURITY_INIT
-#ifdef CONFIG_BLK_DEV_INITRD
-  . = ALIGN(8192);
-  __initramfs_start = .;
-  .init.ramfs : { *(.init.ramfs) }
-  __initramfs_end = .;
-#endif
   NOTES
-  . = ALIGN(8192);
-  __init_end = .;
-
-  .data.init_task : { *(.data.init_task) }      /* The initial task and kernel stack */
+  .init_end : {
+        /* This ALIGN be in a section so that _end is at the end of the
+           load segment. */
+        . = ALIGN(PAGE_SIZE);
+        __init_end = .;
+  }
 
   _end = . ;
 
-  /* Stabs debugging sections.  */
-  .stab 0 : { *(.stab) }
-  .stabstr 0 : { *(.stabstr) }
-  .stab.excl 0 : { *(.stab.excl) }
-  .stab.exclstr 0 : { *(.stab.exclstr) }
-  .stab.index 0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
+  STABS_DEBUG
   .comment 0 : { *(.comment) }
 
   /* Sections to be discarded */
diff --git a/arch/m68k/kernel/vmlinux-sun3.lds b/arch/m68k/kernel/vmlinux-sun3.lds
index 03efaf04d7d7..1ad6b7ad2c17 100644
--- a/arch/m68k/kernel/vmlinux-sun3.lds
+++ b/arch/m68k/kernel/vmlinux-sun3.lds
@@ -2,6 +2,7 @@
 
 #include <asm-generic/vmlinux.lds.h>
 #include <asm/page.h>
+#include <asm/thread_info.h>
 
 OUTPUT_FORMAT("elf32-m68k", "elf32-m68k", "elf32-m68k")
 OUTPUT_ARCH(m68k)
@@ -23,14 +24,8 @@ SECTIONS
 
   _etext = .;                   /* End of text section */
 
-  .data : {                     /* Data */
-        DATA_DATA
-        CONSTRUCTORS
-        . = ALIGN(16);          /* Exception table */
-        __start___ex_table = .;
-        *(__ex_table)
-        __stop___ex_table = .;
-        } :data
+  EXCEPTION_TABLE(16) :data
+  RW_DATA_SECTION(16, PAGE_SIZE, THREAD_SIZE) :data
   /* End of data goes *here* so that freeing init code works properly. */
   _edata = .;
   NOTES
@@ -38,56 +33,21 @@ SECTIONS
   /* will be freed after init */
   . = ALIGN(PAGE_SIZE); /* Init code and data */
 __init_begin = .;
-        .init.text : {
-                _sinittext = .;
-                INIT_TEXT
-                _einittext = .;
-        }
-        .init.data : { INIT_DATA }
-        . = ALIGN(16);
-        __setup_start = .;
-        .init.setup : { *(.init.setup) }
-        __setup_end = .;
-        __initcall_start = .;
-        .initcall.init : {
-                INITCALLS
-        }
-        __initcall_end = .;
-        __con_initcall_start = .;
-        .con_initcall.init : { *(.con_initcall.init) }
-        __con_initcall_end = .;
+        INIT_TEXT_SECTION(PAGE_SIZE)
+        INIT_DATA_SECTION(16)
         .m68k_fixup : {
                 __start_fixup = .;
                 *(.m68k_fixup)
                 __stop_fixup = .;
         }
-        SECURITY_INIT
-#ifdef CONFIG_BLK_DEV_INITRD
-        . = ALIGN(PAGE_SIZE);
-        __initramfs_start = .;
-        .init.ramfs : { *(.init.ramfs) }
-        __initramfs_end = .;
-#endif
         . = ALIGN(PAGE_SIZE);
         __init_end = .;
-        .data.init.task : { *(.data.init_task) }
-
 
-  .bss : { *(.bss) }            /* BSS */
+  BSS_SECTION(0, 0, 0)
 
   _end = . ;
 
-  .crap : {
-        /* Stabs debugging sections.  */
-        *(.stab)
-        *(.stabstr)
-        *(.stab.excl)
-        *(.stab.exclstr)
-        *(.stab.index)
-        *(.stab.indexstr)
-        *(.comment)
-        *(.note)
-  }
+  STABS_DEBUG
 
   /* Sections to be discarded */
   DISCARDS
diff --git a/arch/m68k/mac/Makefile b/arch/m68k/mac/Makefile
index daebd80bdef0..b8d4c835f9a2 100644
--- a/arch/m68k/mac/Makefile
+++ b/arch/m68k/mac/Makefile
@@ -3,4 +3,4 @@
 #
 
 obj-y           := config.o macints.o iop.o via.o oss.o psc.o \
-                        baboon.o macboing.o debug.o misc.o
+                        baboon.o macboing.o misc.o
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index be017984a456..0356da9bf763 100644
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@ -23,6 +23,8 @@
 #include <linux/init.h>
 #include <linux/vt_kern.h>
 #include <linux/platform_device.h>
+#include <linux/adb.h>
+#include <linux/cuda.h>
 
 #define BOOTINFO_COMPAT_1_0
 #include <asm/setup.h>
@@ -44,12 +46,7 @@
 #include <asm/mac_oss.h>
 #include <asm/mac_psc.h>
 
-/* platform device info */
-
-#define SWIM_IO_SIZE 0x2000     /* SWIM IO resource size */
-
 /* Mac bootinfo struct */
-
 struct mac_booter_data mac_bi_data;
 
 /* The phys. video addr. - might be bogus on some machines */
@@ -70,8 +67,6 @@ extern void baboon_init(void);
 
 extern void mac_mksound(unsigned int, unsigned int);
 
-extern void nubus_sweep_video(void);
-
 static void mac_get_model(char *str);
 static void mac_identify(void);
 static void mac_report_hardware(void);
@@ -168,12 +163,6 @@ void __init config_mac(void)
 #if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)
         mach_beep = mac_mksound;
 #endif
-#ifdef CONFIG_HEARTBEAT
-#if 0
-        mach_heartbeat = mac_heartbeat;
-        mach_heartbeat_irq = IRQ_MAC_TIMER;
-#endif
-#endif
 
         /*
          * Determine hardware present
@@ -191,27 +180,19 @@ void __init config_mac(void)
         if (macintosh_config->ident == MAC_MODEL_IICI
             || macintosh_config->ident == MAC_MODEL_IIFX)
                 mach_l2_flush = mac_cache_card_flush;
-
-        /*
-         * Check for machine specific fixups.
-         */
-
-#ifdef OLD_NUBUS_CODE
-        nubus_sweep_video();
-#endif
 }
 
 
 /*
- *      Macintosh Table: hardcoded model configuration data.
+ * Macintosh Table: hardcoded model configuration data.
  *
- *      Much of this was defined by Alan, based on who knows what docs.
- *      I've added a lot more, and some of that was pure guesswork based
- *      on hardware pages present on the Mac web site. Possibly wildly
- *      inaccurate, so look here if a new Mac model won't run. Example: if
- *      a Mac crashes immediately after the VIA1 registers have been dumped
- *      to the screen, it probably died attempting to read DirB on a RBV.
- *      Meaning it should have MAC_VIA_IIci here :-)
+ * Much of this was defined by Alan, based on who knows what docs.
+ * I've added a lot more, and some of that was pure guesswork based
+ * on hardware pages present on the Mac web site. Possibly wildly
+ * inaccurate, so look here if a new Mac model won't run. Example: if
+ * a Mac crashes immediately after the VIA1 registers have been dumped
+ * to the screen, it probably died attempting to read DirB on a RBV.
+ * Meaning it should have MAC_VIA_IIci here :-)
  */
 
 struct mac_model *macintosh_config;
@@ -219,7 +200,7 @@ EXPORT_SYMBOL(macintosh_config);
 
 static struct mac_model mac_data_table[] = {
         /*
-         *      We'll pretend to be a Macintosh II, that's pretty safe.
+         * We'll pretend to be a Macintosh II, that's pretty safe.
          */
 
         {
@@ -230,12 +211,11 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_II,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_IWM
+                .floppy_type    = MAC_FLOPPY_IWM,
         },
 
         /*
-         *      Original MacII hardware
-         *
+         * Original Mac II hardware
          */
 
         {
@@ -246,7 +226,7 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_II,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_IWM
+                .floppy_type    = MAC_FLOPPY_IWM,
         }, {
                 .ident          = MAC_MODEL_IIX,
                 .name           = "IIx",
@@ -255,7 +235,7 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_II,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         }, {
                 .ident          = MAC_MODEL_IICX,
                 .name           = "IIcx",
@@ -264,7 +244,7 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_II,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         }, {
                 .ident          = MAC_MODEL_SE30,
                 .name           = "SE/30",
@@ -273,13 +253,13 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_II,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         },
 
         /*
-         *      Weirdified MacII hardware - all subtly different. Gee thanks
-         *      Apple. All these boxes seem to have VIA2 in a different place to
-         *      the MacII (+1A000 rather than +4000)
+         * Weirdified Mac II hardware - all subtly different. Gee thanks
+         * Apple. All these boxes seem to have VIA2 in a different place to
+         * the Mac II (+1A000 rather than +4000)
          * CSA: see http://developer.apple.com/technotes/hw/hw_09.html
          */
 
@@ -291,7 +271,7 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_II,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         }, {
                 .ident          = MAC_MODEL_IIFX,
                 .name           = "IIfx",
@@ -300,7 +280,7 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_IOP,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_IOP
+                .floppy_type    = MAC_FLOPPY_SWIM_IOP,
         }, {
                 .ident          = MAC_MODEL_IISI,
                 .name           = "IIsi",
@@ -309,7 +289,7 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_II,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         }, {
                 .ident          = MAC_MODEL_IIVI,
                 .name           = "IIvi",
@@ -318,7 +298,7 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_II,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         }, {
                 .ident          = MAC_MODEL_IIVX,
                 .name           = "IIvx",
@@ -327,11 +307,11 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_II,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         },
 
         /*
-         *      Classic models (guessing: similar to SE/30 ?? Nope, similar to LC ...)
+         * Classic models (guessing: similar to SE/30? Nope, similar to LC...)
          */
 
         {
@@ -342,7 +322,7 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_II,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         }, {
                 .ident          = MAC_MODEL_CCL,
                 .name           = "Color Classic",
@@ -351,11 +331,11 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_II,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         },
 
         /*
-         *      Some Mac LC machines. Basically the same as the IIci, ADB like IIsi
+         * Some Mac LC machines. Basically the same as the IIci, ADB like IIsi
          */
 
         {
@@ -366,7 +346,7 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_II,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         }, {
                 .ident          = MAC_MODEL_LCII,
                 .name           = "LC II",
@@ -375,7 +355,7 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_II,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         }, {
                 .ident          = MAC_MODEL_LCIII,
                 .name           = "LC III",
@@ -384,17 +364,17 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_II,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         },
 
         /*
-         *      Quadra. Video is at 0xF9000000, via is like a MacII. We label it differently
-         *      as some of the stuff connected to VIA2 seems different. Better SCSI chip and
-         *      onboard ethernet using a NatSemi SONIC except the 660AV and 840AV which use an
-         *      AMD 79C940 (MACE).
-         *      The 700, 900 and 950 have some I/O chips in the wrong place to
-         *      confuse us. The 840AV has a SCSI location of its own (same as
-         *      the 660AV).
+         * Quadra. Video is at 0xF9000000, via is like a MacII. We label it
+         * differently as some of the stuff connected to VIA2 seems different.
+         * Better SCSI chip and onboard ethernet using a NatSemi SONIC except
+         * the 660AV and 840AV which use an AMD 79C940 (MACE).
+         * The 700, 900 and 950 have some I/O chips in the wrong place to
+         * confuse us. The 840AV has a SCSI location of its own (same as
+         * the 660AV).
          */
 
         {
@@ -405,7 +385,7 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_QUADRA,
                 .scc_type       = MAC_SCC_QUADRA,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR1
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR1,
         }, {
                 .ident          = MAC_MODEL_Q605_ACC,
                 .name           = "Quadra 605",
@@ -414,7 +394,7 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_QUADRA,
                 .scc_type       = MAC_SCC_QUADRA,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR1
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR1,
         }, {
                 .ident          = MAC_MODEL_Q610,
                 .name           = "Quadra 610",
@@ -424,7 +404,7 @@ static struct mac_model mac_data_table[] = {
                 .scc_type       = MAC_SCC_QUADRA,
                 .ether_type     = MAC_ETHER_SONIC,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR1
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR1,
         }, {
                 .ident          = MAC_MODEL_Q630,
                 .name           = "Quadra 630",
@@ -435,7 +415,7 @@ static struct mac_model mac_data_table[] = {
                 .scc_type       = MAC_SCC_QUADRA,
                 .ether_type     = MAC_ETHER_SONIC,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR1
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR1,
         }, {
                 .ident          = MAC_MODEL_Q650,
                 .name           = "Quadra 650",
@@ -445,9 +425,9 @@ static struct mac_model mac_data_table[] = {
                 .scc_type       = MAC_SCC_QUADRA,
                 .ether_type     = MAC_ETHER_SONIC,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR1
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR1,
         },
-        /*      The Q700 does have a NS Sonic */
+        /* The Q700 does have a NS Sonic */
         {
                 .ident          = MAC_MODEL_Q700,
                 .name           = "Quadra 700",
@@ -457,7 +437,7 @@ static struct mac_model mac_data_table[] = {
                 .scc_type       = MAC_SCC_QUADRA,
                 .ether_type     = MAC_ETHER_SONIC,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR1
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR1,
         }, {
                 .ident          = MAC_MODEL_Q800,
                 .name           = "Quadra 800",
@@ -467,7 +447,7 @@ static struct mac_model mac_data_table[] = {
                 .scc_type       = MAC_SCC_QUADRA,
                 .ether_type     = MAC_ETHER_SONIC,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR1
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR1,
         }, {
                 .ident          = MAC_MODEL_Q840,
                 .name           = "Quadra 840AV",
@@ -477,7 +457,7 @@ static struct mac_model mac_data_table[] = {
                 .scc_type       = MAC_SCC_PSC,
                 .ether_type     = MAC_ETHER_MACE,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_AV
+                .floppy_type    = MAC_FLOPPY_AV,
         }, {
                 .ident          = MAC_MODEL_Q900,
                 .name           = "Quadra 900",
@@ -487,7 +467,7 @@ static struct mac_model mac_data_table[] = {
                 .scc_type       = MAC_SCC_IOP,
                 .ether_type     = MAC_ETHER_SONIC,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_IOP
+                .floppy_type    = MAC_FLOPPY_SWIM_IOP,
         }, {
                 .ident          = MAC_MODEL_Q950,
                 .name           = "Quadra 950",
@@ -497,60 +477,60 @@ static struct mac_model mac_data_table[] = {
                 .scc_type       = MAC_SCC_IOP,
                 .ether_type     = MAC_ETHER_SONIC,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_IOP
+                .floppy_type    = MAC_FLOPPY_SWIM_IOP,
         },
 
         /*
-         *      Performa - more LC type machines
+         * Performa - more LC type machines
          */
 
         {
                 .ident          = MAC_MODEL_P460,
-                .name           =  "Performa 460",
+                .name           = "Performa 460",
                 .adb_type       = MAC_ADB_IISI,
                 .via_type       = MAC_VIA_IIci,
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_II,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         }, {
                 .ident          = MAC_MODEL_P475,
-                .name           =  "Performa 475",
+                .name           = "Performa 475",
                 .adb_type       = MAC_ADB_CUDA,
                 .via_type       = MAC_VIA_QUADRA,
                 .scsi_type      = MAC_SCSI_QUADRA,
                 .scc_type       = MAC_SCC_II,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR1
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR1,
         }, {
                 .ident          = MAC_MODEL_P475F,
-                .name           =  "Performa 475",
+                .name           = "Performa 475",
                 .adb_type       = MAC_ADB_CUDA,
                 .via_type       = MAC_VIA_QUADRA,
                 .scsi_type      = MAC_SCSI_QUADRA,
                 .scc_type       = MAC_SCC_II,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR1
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR1,
         }, {
                 .ident          = MAC_MODEL_P520,
-                .name           =  "Performa 520",
+                .name           = "Performa 520",
                 .adb_type       = MAC_ADB_CUDA,
                 .via_type       = MAC_VIA_IIci,
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_II,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         }, {
                 .ident          = MAC_MODEL_P550,
-                .name           =  "Performa 550",
+                .name           = "Performa 550",
                 .adb_type       = MAC_ADB_CUDA,
                 .via_type       = MAC_VIA_IIci,
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_II,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         },
-        /* These have the comm slot, and therefore the possibility of SONIC ethernet */
+        /* These have the comm slot, and therefore possibly SONIC ethernet */
         {
                 .ident          = MAC_MODEL_P575,
                 .name           = "Performa 575",
@@ -560,7 +540,7 @@ static struct mac_model mac_data_table[] = {
                 .scc_type       = MAC_SCC_II,
                 .ether_type     = MAC_ETHER_SONIC,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR1
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR1,
         }, {
                 .ident          = MAC_MODEL_P588,
                 .name           = "Performa 588",
@@ -571,7 +551,7 @@ static struct mac_model mac_data_table[] = {
                 .scc_type       = MAC_SCC_II,
                 .ether_type     = MAC_ETHER_SONIC,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR1
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR1,
         }, {
                 .ident          = MAC_MODEL_TV,
                 .name           = "TV",
@@ -580,7 +560,7 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_II,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         }, {
                 .ident          = MAC_MODEL_P600,
                 .name           = "Performa 600",
@@ -589,14 +569,14 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_II,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         },
 
         /*
-         *      Centris - just guessing again; maybe like Quadra
+         * Centris - just guessing again; maybe like Quadra.
+         * The C610 may or may not have SONIC. We probe to make sure.
          */
 
-        /* The C610 may or may not have SONIC.  We probe to make sure */
         {
                 .ident          = MAC_MODEL_C610,
                 .name           = "Centris 610",
@@ -606,7 +586,7 @@ static struct mac_model mac_data_table[] = {
                 .scc_type       = MAC_SCC_QUADRA,
                 .ether_type     = MAC_ETHER_SONIC,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR1
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR1,
         }, {
                 .ident          = MAC_MODEL_C650,
                 .name           = "Centris 650",
@@ -616,7 +596,7 @@ static struct mac_model mac_data_table[] = {
                 .scc_type       = MAC_SCC_QUADRA,
                 .ether_type     = MAC_ETHER_SONIC,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR1
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR1,
         }, {
                 .ident          = MAC_MODEL_C660,
                 .name           = "Centris 660AV",
@@ -626,7 +606,7 @@ static struct mac_model mac_data_table[] = {
                 .scc_type       = MAC_SCC_PSC,
                 .ether_type     = MAC_ETHER_MACE,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_AV
+                .floppy_type    = MAC_FLOPPY_AV,
         },
 
         /*
@@ -643,7 +623,7 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_QUADRA,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         }, {
                 .ident          = MAC_MODEL_PB145,
                 .name           = "PowerBook 145",
@@ -652,7 +632,7 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_QUADRA,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         }, {
                 .ident          = MAC_MODEL_PB150,
                 .name           = "PowerBook 150",
@@ -662,7 +642,7 @@ static struct mac_model mac_data_table[] = {
                 .ide_type       = MAC_IDE_PB,
                 .scc_type       = MAC_SCC_QUADRA,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         }, {
                 .ident          = MAC_MODEL_PB160,
                 .name           = "PowerBook 160",
@@ -671,7 +651,7 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_QUADRA,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         }, {
                 .ident          = MAC_MODEL_PB165,
                 .name           = "PowerBook 165",
@@ -680,7 +660,7 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_QUADRA,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         }, {
                 .ident          = MAC_MODEL_PB165C,
                 .name           = "PowerBook 165c",
@@ -689,7 +669,7 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_QUADRA,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         }, {
                 .ident          = MAC_MODEL_PB170,
                 .name           = "PowerBook 170",
@@ -698,7 +678,7 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_QUADRA,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         }, {
                 .ident          = MAC_MODEL_PB180,
                 .name           = "PowerBook 180",
@@ -707,7 +687,7 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_QUADRA,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         }, {
                 .ident          = MAC_MODEL_PB180C,
                 .name           = "PowerBook 180c",
@@ -716,7 +696,7 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_QUADRA,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         }, {
                 .ident          = MAC_MODEL_PB190,
                 .name           = "PowerBook 190",
@@ -726,7 +706,7 @@ static struct mac_model mac_data_table[] = {
                 .ide_type       = MAC_IDE_BABOON,
                 .scc_type       = MAC_SCC_QUADRA,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         }, {
                 .ident          = MAC_MODEL_PB520,
                 .name           = "PowerBook 520",
@@ -736,7 +716,7 @@ static struct mac_model mac_data_table[] = {
                 .scc_type       = MAC_SCC_QUADRA,
                 .ether_type     = MAC_ETHER_SONIC,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         },
 
         /*
@@ -757,7 +737,7 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_QUADRA,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         }, {
                 .ident          = MAC_MODEL_PB230,
                 .name           = "PowerBook Duo 230",
@@ -766,7 +746,7 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_QUADRA,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         }, {
                 .ident          = MAC_MODEL_PB250,
                 .name           = "PowerBook Duo 250",
@@ -775,7 +755,7 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_QUADRA,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         }, {
                 .ident          = MAC_MODEL_PB270C,
                 .name           = "PowerBook Duo 270c",
@@ -784,7 +764,7 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_QUADRA,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         }, {
                 .ident          = MAC_MODEL_PB280,
                 .name           = "PowerBook Duo 280",
@@ -793,7 +773,7 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_QUADRA,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         }, {
                 .ident          = MAC_MODEL_PB280C,
                 .name           = "PowerBook Duo 280c",
@@ -802,17 +782,44 @@ static struct mac_model mac_data_table[] = {
                 .scsi_type      = MAC_SCSI_OLD,
                 .scc_type       = MAC_SCC_QUADRA,
                 .nubus_type     = MAC_NUBUS,
-                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2
+                .floppy_type    = MAC_FLOPPY_SWIM_ADDR2,
         },
 
         /*
-         *      Other stuff ??
+         * Other stuff?
          */
+
         {
                 .ident          = -1
         }
 };
 
+static struct resource scc_a_rsrcs[] = {
+        { .flags = IORESOURCE_MEM },
+        { .flags = IORESOURCE_IRQ },
+};
+
+static struct resource scc_b_rsrcs[] = {
+        { .flags = IORESOURCE_MEM },
+        { .flags = IORESOURCE_IRQ },
+};
+
+struct platform_device scc_a_pdev = {
+        .name           = "scc",
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(scc_a_rsrcs),
+        .resource       = scc_a_rsrcs,
+};
+EXPORT_SYMBOL(scc_a_pdev);
+
+struct platform_device scc_b_pdev = {
+        .name           = "scc",
+        .id             = 1,
+        .num_resources  = ARRAY_SIZE(scc_b_rsrcs),
+        .resource       = scc_b_rsrcs,
+};
+EXPORT_SYMBOL(scc_b_pdev);
+
 static void __init mac_identify(void)
 {
         struct mac_model *m;
@@ -823,7 +830,8 @@ static void __init mac_identify(void)
                 /* no bootinfo model id -> NetBSD booter was used! */
                 /* XXX FIXME: breaks for model > 31 */
                 model = (mac_bi_data.cpuid >> 2) & 63;
-                printk(KERN_WARNING "No bootinfo model ID, using cpuid instead (hey, use Penguin!)\n");
+                printk(KERN_WARNING "No bootinfo model ID, using cpuid instead "
+                       "(obsolete bootloader?)\n");
         }
 
         macintosh_config = mac_data_table;
@@ -834,10 +842,29 @@ static void __init mac_identify(void)
                 }
         }
 
-        /* We need to pre-init the IOPs, if any. Otherwise */
-        /* the serial console won't work if the user had   */
-        /* the serial ports set to "Faster" mode in MacOS. */
+        /* Set up serial port resources for the console initcall. */
+
+        scc_a_rsrcs[0].start = (resource_size_t) mac_bi_data.sccbase + 2;
+        scc_a_rsrcs[0].end   = scc_a_rsrcs[0].start;
+        scc_b_rsrcs[0].start = (resource_size_t) mac_bi_data.sccbase;
+        scc_b_rsrcs[0].end   = scc_b_rsrcs[0].start;
 
+        switch (macintosh_config->scc_type) {
+        case MAC_SCC_PSC:
+                scc_a_rsrcs[1].start = scc_a_rsrcs[1].end = IRQ_MAC_SCC_A;
+                scc_b_rsrcs[1].start = scc_b_rsrcs[1].end = IRQ_MAC_SCC_B;
+                break;
+        default:
+                scc_a_rsrcs[1].start = scc_a_rsrcs[1].end = IRQ_MAC_SCC;
+                scc_b_rsrcs[1].start = scc_b_rsrcs[1].end = IRQ_MAC_SCC;
+                break;
+        }
+
+        /*
+         * We need to pre-init the IOPs, if any. Otherwise
+         * the serial console won't work if the user had
+         * the serial ports set to "Faster" mode in MacOS.
+         */
         iop_preinit();
 
         printk(KERN_INFO "Detected Macintosh model: %d \n", model);
@@ -846,7 +873,8 @@ static void __init mac_identify(void)
          * Report booter data:
          */
         printk(KERN_DEBUG " Penguin bootinfo data:\n");
-        printk(KERN_DEBUG " Video: addr 0x%lx row 0x%lx depth %lx dimensions %ld x %ld\n",
+        printk(KERN_DEBUG " Video: addr 0x%lx "
+                "row 0x%lx depth %lx dimensions %ld x %ld\n",
                 mac_bi_data.videoaddr, mac_bi_data.videorow,
                 mac_bi_data.videodepth, mac_bi_data.dimensions & 0xFFFF,
                 mac_bi_data.dimensions >> 16);
@@ -863,6 +891,10 @@ static void __init mac_identify(void)
         oss_init();
         psc_init();
         baboon_init();
+
+#ifdef CONFIG_ADB_CUDA
+        find_via_cuda();
+#endif
 }
 
 static void __init mac_report_hardware(void)
@@ -876,23 +908,50 @@ static void mac_get_model(char *str)
         strcat(str, macintosh_config->name);
 }
 
-static struct resource swim_resources[1];
+static struct resource swim_rsrc = { .flags = IORESOURCE_MEM };
 
-static struct platform_device swim_device = {
+static struct platform_device swim_pdev = {
         .name           = "swim",
         .id             = -1,
-        .num_resources  = ARRAY_SIZE(swim_resources),
-        .resource       = swim_resources,
+        .num_resources  = 1,
+        .resource       = &swim_rsrc,
 };
 
-static struct platform_device *mac_platform_devices[] __initdata = {
-        &swim_device
+static struct platform_device esp_0_pdev = {
+        .name           = "mac_esp",
+        .id             = 0,
+};
+
+static struct platform_device esp_1_pdev = {
+        .name           = "mac_esp",
+        .id             = 1,
+};
+
+static struct platform_device sonic_pdev = {
+        .name           = "macsonic",
+        .id             = -1,
+};
+
+static struct platform_device mace_pdev = {
+        .name           = "macmace",
+        .id             = -1,
 };
 
 int __init mac_platform_init(void)
 {
         u8 *swim_base;
 
+        /*
+         * Serial devices
+         */
+
+        platform_device_register(&scc_a_pdev);
+        platform_device_register(&scc_b_pdev);
+
+        /*
+         * Floppy device
+         */
+
         switch (macintosh_config->floppy_type) {
         case MAC_FLOPPY_SWIM_ADDR1:
                 swim_base = (u8 *)(VIA1_BASE + 0x1E000);
@@ -901,16 +960,47 @@ int __init mac_platform_init(void)
                 swim_base = (u8 *)(VIA1_BASE + 0x16000);
                 break;
         default:
-                return 0;
+                swim_base = NULL;
+                break;
         }
 
-        swim_resources[0].name = "swim-regs";
-        swim_resources[0].start = (resource_size_t)swim_base;
-        swim_resources[0].end = (resource_size_t)(swim_base + SWIM_IO_SIZE);
-        swim_resources[0].flags = IORESOURCE_MEM;
+        if (swim_base) {
+                swim_rsrc.start = (resource_size_t) swim_base,
+                swim_rsrc.end   = (resource_size_t) swim_base + 0x2000,
+                platform_device_register(&swim_pdev);
+        }
+
+        /*
+         * SCSI device(s)
+         */
+
+        switch (macintosh_config->scsi_type) {
+        case MAC_SCSI_QUADRA:
+        case MAC_SCSI_QUADRA3:
+                platform_device_register(&esp_0_pdev);
+                break;
+        case MAC_SCSI_QUADRA2:
+                platform_device_register(&esp_0_pdev);
+                if ((macintosh_config->ident == MAC_MODEL_Q900) ||
+                    (macintosh_config->ident == MAC_MODEL_Q950))
+                        platform_device_register(&esp_1_pdev);
+                break;
+        }
+
+        /*
+         * Ethernet device
+         */
+
+        switch (macintosh_config->ether_type) {
+        case MAC_ETHER_SONIC:
+                platform_device_register(&sonic_pdev);
+                break;
+        case MAC_ETHER_MACE:
+                platform_device_register(&mace_pdev);
+                break;
+        }
 
-        return platform_add_devices(mac_platform_devices,
-                                    ARRAY_SIZE(mac_platform_devices));
+        return 0;
 }
 
 arch_initcall(mac_platform_init);
diff --git a/arch/m68k/mac/debug.c b/arch/m68k/mac/debug.c
deleted file mode 100644
index bce074ceb768..000000000000
--- a/arch/m68k/mac/debug.c
+++ /dev/null
@@ -1,365 +0,0 @@
-/*
- * linux/arch/m68k/mac/debug.c
- *
- * Shamelessly stolen (SCC code and general framework) from:
- *
- * linux/arch/m68k/atari/debug.c
- *
- * Atari debugging and serial console stuff
- *
- * Assembled of parts of former atari/config.c 97-12-18 by Roman Hodek
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file COPYING in the main directory of this archive
- * for more details.
- */
-
-#include <linux/types.h>
-#include <linux/sched.h>
-#include <linux/tty.h>
-#include <linux/console.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-
-#define BOOTINFO_COMPAT_1_0
-#include <asm/setup.h>
-#include <asm/bootinfo.h>
-#include <asm/macints.h>
-
-extern unsigned long mac_videobase;
-extern unsigned long mac_rowbytes;
-
-extern void mac_serial_print(const char *);
-
-#define DEBUG_HEADS
-#undef DEBUG_SCREEN
-#define DEBUG_SERIAL
-
-/*
- * These two auxiliary debug functions should go away ASAP. Only usage:
- * before the console output is up (after head.S come some other crucial
- * setup routines :-) it permits writing 'data' to the screen as bit patterns
- * (good luck reading those). Helped to figure that the bootinfo contained
- * garbage data on the amount and size of memory chunks ...
- *
- * The 'pos' argument now simply means 'linefeed after print' ...
- */
-
-#ifdef DEBUG_SCREEN
-static int peng, line;
-#endif
-
-#if 0
-
-void mac_debugging_short(int pos, short num)
-{
-#ifdef DEBUG_SCREEN
-        unsigned char *pengoffset;
-        unsigned char *pptr;
-        int i;
-#endif
-
-#ifdef DEBUG_SERIAL
-        printk("debug: %d !\n", num);
-#endif
-
-#ifdef DEBUG_SCREEN
-        if (!MACH_IS_MAC) {
-                /* printk("debug: %d !\n", num); */
-                return;
-        }
-
-        /* calculate current offset */
-        pengoffset = (unsigned char *)mac_videobase +
-                (150+line*2) * mac_rowbytes + 80 * peng;
-
-        pptr = pengoffset;
-
-        for (i = 0; i < 8 * sizeof(short); i++) { /* # of bits */
-                /*        value        mask for bit i, reverse order */
-                *pptr++ = (num & (1 << (8*sizeof(short)-i-1)) ? 0xFF : 0x00);
-        }
-
-        peng++;
-
-        if (pos) {
-                line++;
-                peng = 0;
-        }
-#endif
-}
-
-void mac_debugging_long(int pos, long addr)
-{
-#ifdef DEBUG_SCREEN
-        unsigned char *pengoffset;
-        unsigned char *pptr;
-        int i;
-#endif
-
-#ifdef DEBUG_SERIAL
-        printk("debug: #%ld !\n", addr);
-#endif
-
-#ifdef DEBUG_SCREEN
-        if (!MACH_IS_MAC) {
-                /* printk("debug: #%ld !\n", addr); */
-                return;
-        }
-
-        pengoffset=(unsigned char *)(mac_videobase+(150+line*2)*mac_rowbytes)
-                    +80*peng;
-
-        pptr = pengoffset;
-
-        for (i = 0; i < 8 * sizeof(long); i++) { /* # of bits */
-                *pptr++ = (addr & (1 << (8*sizeof(long)-i-1)) ? 0xFF : 0x00);
-        }
-
-        peng++;
-
-        if (pos) {
-                line++;
-                peng = 0;
-        }
-#endif
-}
-
-#endif  /*  0  */
-
-#ifdef DEBUG_SERIAL
-/*
- * TODO: serial debug code
- */
-
-struct mac_SCC {
-        u_char cha_b_ctrl;
-        u_char char_dummy1;
-        u_char cha_a_ctrl;
-        u_char char_dummy2;
-        u_char cha_b_data;
-        u_char char_dummy3;
-        u_char cha_a_data;
-};
-
-# define scc (*((volatile struct mac_SCC*)mac_bi_data.sccbase))
-
-static int scc_port = -1;
-
-static struct console mac_console_driver = {
-        .name   = "debug",
-        .flags  = CON_PRINTBUFFER,
-        .index  = -1,
-};
-
-/*
- * Crude hack to get console output to the screen before the framebuffer
- * is initialized (happens a lot later in 2.1!).
- * We just use the console routines declared in head.S, this will interfere
- * with regular framebuffer console output and should be used exclusively
- * to debug kernel problems manifesting before framebuffer init (aka WSOD)
- *
- * To keep this hack from interfering with the regular console driver, either
- * deregister this driver before/on framebuffer console init, or silence this
- * function after the fbcon driver is running (will lose console messages!?).
- * To debug real early bugs, need to write a 'mac_register_console_hack()'
- * that is called from start_kernel() before setup_arch() and just registers
- * this driver if Mac.
- */
-
-static void mac_debug_console_write(struct console *co, const char *str,
-                                    unsigned int count)
-{
-        mac_serial_print(str);
-}
-
-
-
-/* Mac: loops_per_jiffy min. 19000 ^= .5 us; MFPDELAY was 0.6 us*/
-
-#define uSEC 1
-
-static inline void mac_sccb_out(char c)
-{
-        int i;
-
-        do {
-                for (i = uSEC; i > 0; --i)
-                        barrier();
-        } while (!(scc.cha_b_ctrl & 0x04)); /* wait for tx buf empty */
-        for (i = uSEC; i > 0; --i)
-                barrier();
-        scc.cha_b_data = c;
-}
-
-static inline void mac_scca_out(char c)
-{
-        int i;
-
-        do {
-                for (i = uSEC; i > 0; --i)
-                        barrier();
-        } while (!(scc.cha_a_ctrl & 0x04)); /* wait for tx buf empty */
-        for (i = uSEC; i > 0; --i)
-                barrier();
-        scc.cha_a_data = c;
-}
-
-static void mac_sccb_console_write(struct console *co, const char *str,
-                                   unsigned int count)
-{
-        while (count--) {
-                if (*str == '\n')
-                        mac_sccb_out('\r');
-                mac_sccb_out(*str++);
-        }
-}
-
-static void mac_scca_console_write(struct console *co, const char *str,
-                                   unsigned int count)
-{
-        while (count--) {
-                if (*str == '\n')
-                        mac_scca_out('\r');
-                mac_scca_out(*str++);
-        }
-}
-
-
-/* The following two functions do a quick'n'dirty initialization of the MFP or
- * SCC serial ports. They're used by the debugging interface, kgdb, and the
- * serial console code. */
-#define SCCB_WRITE(reg,val)                             \
-        do {                                            \
-                int i;                                  \
-                scc.cha_b_ctrl = (reg);                 \
-                for (i = uSEC; i > 0; --i)              \
-                        barrier();                      \
-                scc.cha_b_ctrl = (val);                 \
-                for (i = uSEC; i > 0; --i)              \
-                        barrier();                      \
-        } while(0)
-
-#define SCCA_WRITE(reg,val)                             \
-        do {                                            \
-                int i;                                  \
-                scc.cha_a_ctrl = (reg);                 \
-                for (i = uSEC; i > 0; --i)              \
-                        barrier();                      \
-                scc.cha_a_ctrl = (val);                 \
-                for (i = uSEC; i > 0; --i)              \
-                        barrier();                      \
-        } while(0)
-
-/* loops_per_jiffy isn't initialized yet, so we can't use udelay(). This does a
- * delay of ~ 60us. */
-/* Mac: loops_per_jiffy min. 19000 ^= .5 us; MFPDELAY was 0.6 us*/
-#define LONG_DELAY()                                    \
-        do {                                            \
-                int i;                                  \
-                for (i = 60*uSEC; i > 0; --i)           \
-                    barrier();                          \
-        } while(0)
-
-static void __init mac_init_scc_port(int cflag, int port)
-{
-        /*
-         * baud rates: 1200, 1800, 2400, 4800, 9600, 19.2k, 38.4k, 57.6k, 115.2k
-         */
-
-        static int clksrc_table[9] =
-                /* reg 11: 0x50 = BRG, 0x00 = RTxC, 0x28 = TRxC */
-                { 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x00, 0x00 };
-        static int clkmode_table[9] =
-                /* reg 4: 0x40 = x16, 0x80 = x32, 0xc0 = x64 */
-                { 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0xc0, 0x80 };
-        static int div_table[9] =
-                /* reg12 (BRG low) */
-                { 94, 62, 46, 22, 10, 4, 1, 0, 0 };
-
-        int baud = cflag & CBAUD;
-        int clksrc, clkmode, div, reg3, reg5;
-
-        if (cflag & CBAUDEX)
-                baud += B38400;
-        if (baud < B1200 || baud > B38400+2)
-                baud = B9600; /* use default 9600bps for non-implemented rates */
-        baud -= B1200; /* tables starts at 1200bps */
-
-        clksrc  = clksrc_table[baud];
-        clkmode = clkmode_table[baud];
-        div     = div_table[baud];
-
-        reg3 = (((cflag & CSIZE) == CS8) ? 0xc0 : 0x40);
-        reg5 = (((cflag & CSIZE) == CS8) ? 0x60 : 0x20) | 0x82 /* assert DTR/RTS */;
-
-        if (port == 1) {
-                (void)scc.cha_b_ctrl;   /* reset reg pointer */
-                SCCB_WRITE(9, 0xc0);    /* reset */
-                LONG_DELAY();           /* extra delay after WR9 access */
-                SCCB_WRITE(4, (cflag & PARENB) ? ((cflag & PARODD) ? 0x01 : 0x03) : 0 |
-                           0x04 /* 1 stopbit */ |
-                           clkmode);
-                SCCB_WRITE(3, reg3);
-                SCCB_WRITE(5, reg5);
-                SCCB_WRITE(9, 0);       /* no interrupts */
-                LONG_DELAY();           /* extra delay after WR9 access */
-                SCCB_WRITE(10, 0);      /* NRZ mode */
-                SCCB_WRITE(11, clksrc); /* main clock source */
-                SCCB_WRITE(12, div);    /* BRG value */
-                SCCB_WRITE(13, 0);      /* BRG high byte */
-                SCCB_WRITE(14, 1);
-                SCCB_WRITE(3, reg3 | 1);
-                SCCB_WRITE(5, reg5 | 8);
-        } else if (port == 0) {
-                (void)scc.cha_a_ctrl;   /* reset reg pointer */
-                SCCA_WRITE(9, 0xc0);    /* reset */
-                LONG_DELAY();           /* extra delay after WR9 access */
-                SCCA_WRITE(4, (cflag & PARENB) ? ((cflag & PARODD) ? 0x01 : 0x03) : 0 |
-                          0x04 /* 1 stopbit */ |
-                          clkmode);
-                SCCA_WRITE(3, reg3);
-                SCCA_WRITE(5, reg5);
-                SCCA_WRITE(9, 0);       /* no interrupts */
-                LONG_DELAY();           /* extra delay after WR9 access */
-                SCCA_WRITE(10, 0);      /* NRZ mode */
-                SCCA_WRITE(11, clksrc); /* main clock source */
-                SCCA_WRITE(12, div);    /* BRG value */
-                SCCA_WRITE(13, 0);      /* BRG high byte */
-                SCCA_WRITE(14, 1);
-                SCCA_WRITE(3, reg3 | 1);
-                SCCA_WRITE(5, reg5 | 8);
-        }
-}
-#endif /* DEBUG_SERIAL */
-
-static int __init mac_debug_setup(char *arg)
-{
-        if (!MACH_IS_MAC)
-                return 0;
-
-#ifdef DEBUG_SERIAL
-        if (!strcmp(arg, "ser") || !strcmp(arg, "ser1")) {
-                /* Mac modem port */
-                mac_init_scc_port(B9600|CS8, 0);
-                mac_console_driver.write = mac_scca_console_write;
-                scc_port = 0;
-        } else if (!strcmp(arg, "ser2")) {
-                /* Mac printer port */
-                mac_init_scc_port(B9600|CS8, 1);
-                mac_console_driver.write = mac_sccb_console_write;
-                scc_port = 1;
-        }
-#endif
-#ifdef DEBUG_HEADS
-        if (!strcmp(arg, "scn") || !strcmp(arg, "con")) {
-                /* display, using head.S console routines */
-                mac_console_driver.write = mac_debug_console_write;
-        }
-#endif
-        if (mac_console_driver.write)
-                register_console(&mac_console_driver);
-        return 0;
-}
-
-early_param("debug", mac_debug_setup);
diff --git a/arch/m68k/mac/macints.c b/arch/m68k/mac/macints.c
index 23711074e0e2..900d899f3323 100644
--- a/arch/m68k/mac/macints.c
+++ b/arch/m68k/mac/macints.c
@@ -34,9 +34,7 @@
  *
  *      3       - unused (?)
  *
- *      4       - SCC (slot number determined by reading RR3 on the SSC itself)
- *                - slot 1: SCC channel A
- *                - slot 2: SCC channel B
+ *      4       - SCC
  *
  *      5       - unused (?)
  *                [serial errors or special conditions seem to raise level 6
@@ -55,8 +53,6 @@
  *                - slot 5: Slot $E
  *
  *      4       - SCC IOP
- *                - slot 1: SCC channel A
- *                - slot 2: SCC channel B
  *
  *      5       - ISM IOP (ADB?)
  *
@@ -136,13 +132,8 @@
 #include <asm/irq_regs.h>
 #include <asm/mac_oss.h>
 
-#define DEBUG_SPURIOUS
 #define SHUTUP_SONIC
 
-/* SCC interrupt mask */
-
-static int scc_mask;
-
 /*
  * VIA/RBV hooks
  */
@@ -191,13 +182,6 @@ extern void baboon_irq_disable(int);
 extern void baboon_irq_clear(int);
 
 /*
- * SCC interrupt routines
- */
-
-static void scc_irq_enable(unsigned int);
-static void scc_irq_disable(unsigned int);
-
-/*
  * console_loglevel determines NMI handler function
  */
 
@@ -221,8 +205,6 @@ void __init mac_init_IRQ(void)
 #ifdef DEBUG_MACINTS
         printk("mac_init_IRQ(): Setting things up...\n");
 #endif
-        scc_mask = 0;
-
         m68k_setup_irq_controller(&mac_irq_controller, IRQ_USER,
                                   NUM_MAC_SOURCES - IRQ_USER);
         /* Make sure the SONIC interrupt is cleared or things get ugly */
@@ -283,15 +265,16 @@ void mac_enable_irq(unsigned int irq)
                         via_irq_enable(irq);
                 break;
         case 3:
-        case 4:
         case 5:
         case 6:
                 if (psc_present)
                         psc_irq_enable(irq);
                 else if (oss_present)
                         oss_irq_enable(irq);
-                else if (irq_src == 4)
-                        scc_irq_enable(irq);
+                break;
+        case 4:
+                if (psc_present)
+                        psc_irq_enable(irq);
                 break;
         case 8:
                 if (baboon_present)
@@ -316,15 +299,16 @@ void mac_disable_irq(unsigned int irq)
                         via_irq_disable(irq);
                 break;
         case 3:
-        case 4:
         case 5:
         case 6:
                 if (psc_present)
                         psc_irq_disable(irq);
                 else if (oss_present)
                         oss_irq_disable(irq);
-                else if (irq_src == 4)
-                        scc_irq_disable(irq);
+                break;
+        case 4:
+                if (psc_present)
+                        psc_irq_disable(irq);
                 break;
         case 8:
                 if (baboon_present)
@@ -347,7 +331,6 @@ void mac_clear_irq(unsigned int irq)
                         via_irq_clear(irq);
                 break;
         case 3:
-        case 4:
         case 5:
         case 6:
                 if (psc_present)
@@ -355,6 +338,10 @@ void mac_clear_irq(unsigned int irq)
                 else if (oss_present)
                         oss_irq_clear(irq);
                 break;
+        case 4:
+                if (psc_present)
+                        psc_irq_clear(irq);
+                break;
         case 8:
                 if (baboon_present)
                         baboon_irq_clear(irq);
@@ -374,13 +361,17 @@ int mac_irq_pending(unsigned int irq)
                 else
                         return via_irq_pending(irq);
         case 3:
-        case 4:
         case 5:
         case 6:
                 if (psc_present)
                         return psc_irq_pending(irq);
                 else if (oss_present)
                         return oss_irq_pending(irq);
+                break;
+        case 4:
+                if (psc_present)
+                        psc_irq_pending(irq);
+                break;
         }
         return 0;
 }
@@ -448,59 +439,3 @@ irqreturn_t mac_nmi_handler(int irq, void *dev_id)
         in_nmi--;
         return IRQ_HANDLED;
 }
-
-/*
- * Simple routines for masking and unmasking
- * SCC interrupts in cases where this can't be
- * done in hardware (only the PSC can do that.)
- */
-
-static void scc_irq_enable(unsigned int irq)
-{
-        int irq_idx = IRQ_IDX(irq);
-
-        scc_mask |= (1 << irq_idx);
-}
-
-static void scc_irq_disable(unsigned int irq)
-{
-        int irq_idx = IRQ_IDX(irq);
-
-        scc_mask &= ~(1 << irq_idx);
-}
-
-/*
- * SCC master interrupt handler. We have to do a bit of magic here
- * to figure out what channel gave us the interrupt; putting this
- * here is cleaner than hacking it into drivers/char/macserial.c.
- */
-
-void mac_scc_dispatch(int irq, void *dev_id)
-{
-        volatile unsigned char *scc = (unsigned char *) mac_bi_data.sccbase + 2;
-        unsigned char reg;
-        unsigned long flags;
-
-        /* Read RR3 from the chip. Always do this on channel A */
-        /* This must be an atomic operation so disable irqs.   */
-
-        local_irq_save(flags);
-        *scc = 3;
-        reg = *scc;
-        local_irq_restore(flags);
-
-        /* Now dispatch. Bits 0-2 are for channel B and */
-        /* bits 3-5 are for channel A. We can safely    */
-        /* ignore the remaining bits here.              */
-        /*                                              */
-        /* Note that we're ignoring scc_mask for now.   */
-        /* If we actually mask the ints then we tend to */
-        /* get hammered by very persistent SCC irqs,    */
-        /* and since they're autovector interrupts they */
-        /* pretty much kill the system.                 */
-
-        if (reg & 0x38)
-                m68k_handle_int(IRQ_SCCA);
-        if (reg & 0x07)
-                m68k_handle_int(IRQ_SCCB);
-}
diff --git a/arch/m68k/mac/misc.c b/arch/m68k/mac/misc.c
index 5d818568b343..0f118ca156d9 100644
--- a/arch/m68k/mac/misc.c
+++ b/arch/m68k/mac/misc.c
@@ -8,7 +8,6 @@
 #include <linux/kernel.h>
 #include <linux/delay.h>
 #include <linux/sched.h>
-#include <linux/slab.h>
 #include <linux/time.h>
 #include <linux/rtc.h>
 #include <linux/mm.h>
diff --git a/arch/m68k/mac/oss.c b/arch/m68k/mac/oss.c
index f3d23d6ebcf8..a9c0f5ab4cc0 100644
--- a/arch/m68k/mac/oss.c
+++ b/arch/m68k/mac/oss.c
@@ -33,7 +33,6 @@ static irqreturn_t oss_irq(int, void *);
 static irqreturn_t oss_nubus_irq(int, void *);
 
 extern irqreturn_t via1_irq(int, void *);
-extern irqreturn_t mac_scc_dispatch(int, void *);
 
 /*
  * Initialize the OSS
@@ -69,9 +68,6 @@ void __init oss_register_interrupts(void)
         if (request_irq(OSS_IRQLEV_SCSI, oss_irq, IRQ_FLG_LOCK,
                         "scsi", (void *) oss))
                 pr_err("Couldn't register %s interrupt\n", "scsi");
-        if (request_irq(OSS_IRQLEV_IOPSCC, mac_scc_dispatch, IRQ_FLG_LOCK,
-                        "scc", mac_scc_dispatch))
-                pr_err("Couldn't register %s interrupt\n", "scc");
         if (request_irq(OSS_IRQLEV_NUBUS, oss_nubus_irq, IRQ_FLG_LOCK,
                         "nubus", (void *) oss))
                 pr_err("Couldn't register %s interrupt\n", "nubus");
@@ -172,9 +168,7 @@ void oss_irq_enable(int irq) {
         printk("oss_irq_enable(%d)\n", irq);
 #endif
         switch(irq) {
-                case IRQ_SCC:
-                case IRQ_SCCA:
-                case IRQ_SCCB:
+                case IRQ_MAC_SCC:
                         oss->irq_level[OSS_IOPSCC] = OSS_IRQLEV_IOPSCC;
                         break;
                 case IRQ_MAC_ADB:
@@ -212,9 +206,7 @@ void oss_irq_disable(int irq) {
         printk("oss_irq_disable(%d)\n", irq);
 #endif
         switch(irq) {
-                case IRQ_SCC:
-                case IRQ_SCCA:
-                case IRQ_SCCB:
+                case IRQ_MAC_SCC:
                         oss->irq_level[OSS_IOPSCC] = OSS_IRQLEV_DISABLED;
                         break;
                 case IRQ_MAC_ADB:
@@ -250,9 +242,7 @@ void oss_irq_disable(int irq) {
 void oss_irq_clear(int irq) {
         /* FIXME: how to do this on OSS? */
         switch(irq) {
-                case IRQ_SCC:
-                case IRQ_SCCA:
-                case IRQ_SCCB:
+                case IRQ_MAC_SCC:
                         oss->irq_pending &= ~OSS_IP_IOPSCC;
                         break;
                 case IRQ_MAC_ADB:
@@ -280,9 +270,7 @@ void oss_irq_clear(int irq) {
 int oss_irq_pending(int irq)
 {
         switch(irq) {
-                case IRQ_SCC:
-                case IRQ_SCCA:
-                case IRQ_SCCB:
+                case IRQ_MAC_SCC:
                         return oss->irq_pending & OSS_IP_IOPSCC;
                         break;
                 case IRQ_MAC_ADB:
diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c
index 11bce3cb6482..e71166daec6a 100644
--- a/arch/m68k/mac/via.c
+++ b/arch/m68k/mac/via.c
@@ -84,8 +84,6 @@ void via_irq_enable(int irq);
 void via_irq_disable(int irq);
 void via_irq_clear(int irq);
 
-extern irqreturn_t mac_scc_dispatch(int, void *);
-
 /*
  * Initialize the VIAs
  *
@@ -311,11 +309,6 @@ void __init via_register_interrupts(void)
         if (request_irq(IRQ_AUTO_2, via2_irq, IRQ_FLG_LOCK|IRQ_FLG_FAST,
                         "via2", (void *) via2))
                 pr_err("Couldn't register %s interrupt\n", "via2");
-        if (!psc_present) {
-                if (request_irq(IRQ_AUTO_4, mac_scc_dispatch, IRQ_FLG_LOCK,
-                                "scc", mac_scc_dispatch))
-                        pr_err("Couldn't register %s interrupt\n", "scc");
-        }
         if (request_irq(IRQ_MAC_NUBUS, via_nubus_irq,
                         IRQ_FLG_LOCK|IRQ_FLG_FAST, "nubus", (void *) via2))
                 pr_err("Couldn't register %s interrupt\n", "nubus");
diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c
index 774549accd2d..8bc842554e5b 100644
--- a/arch/m68k/mm/init.c
+++ b/arch/m68k/mm/init.c
@@ -17,6 +17,7 @@
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/bootmem.h>
+#include <linux/gfp.h>
 
 #include <asm/setup.h>
 #include <asm/uaccess.h>
diff --git a/arch/m68k/mm/kmap.c b/arch/m68k/mm/kmap.c
index df620ac2a296..69345849454b 100644
--- a/arch/m68k/mm/kmap.c
+++ b/arch/m68k/mm/kmap.c
@@ -99,8 +99,7 @@ static inline void free_io_area(void *addr)
 #endif
 
 /*
- * Map some physical address range into the kernel address space. The
- * code is copied and adapted from map_chunk().
+ * Map some physical address range into the kernel address space.
  */
 /* Rewritten by Andreas Schwab to remove all races. */
 
@@ -116,7 +115,7 @@ void __iomem *__ioremap(unsigned long physaddr, unsigned long size, int cachefla
         /*
          * Don't allow mappings that wrap..
          */
-        if (!size || size > physaddr + size)
+        if (!size || physaddr > (unsigned long)(-size))
                 return NULL;
 
 #ifdef CONFIG_AMIGA
diff --git a/arch/m68k/mm/memory.c b/arch/m68k/mm/memory.c
index b7473525b431..34c77ce24fba 100644
--- a/arch/m68k/mm/memory.c
+++ b/arch/m68k/mm/memory.c
@@ -9,9 +9,9 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>
-#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/pagemap.h>
+#include <linux/gfp.h>
 
 #include <asm/setup.h>
 #include <asm/segment.h>
diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c
index 4665fc84b7dc..02b7a03e4226 100644
--- a/arch/m68k/mm/motorola.c
+++ b/arch/m68k/mm/motorola.c
@@ -18,6 +18,7 @@
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/bootmem.h>
+#include <linux/gfp.h>
 
 #include <asm/setup.h>
 #include <asm/uaccess.h>
diff --git a/arch/m68k/mvme16x/rtc.c b/arch/m68k/mvme16x/rtc.c
index cea5e3e4e636..8da9c250d3e1 100644
--- a/arch/m68k/mvme16x/rtc.c
+++ b/arch/m68k/mvme16x/rtc.c
@@ -9,7 +9,6 @@
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/miscdevice.h>
-#include <linux/slab.h>
 #include <linux/smp_lock.h>
 #include <linux/ioport.h>
 #include <linux/capability.h>
diff --git a/arch/m68k/sun3/mmu_emu.c b/arch/m68k/sun3/mmu_emu.c
index 3cd19390aae5..94f81ecfe3f8 100644
--- a/arch/m68k/sun3/mmu_emu.c
+++ b/arch/m68k/sun3/mmu_emu.c
@@ -45,8 +45,8 @@
 ** Globals
 */
 
-unsigned long vmalloc_end;
-EXPORT_SYMBOL(vmalloc_end);
+unsigned long m68k_vmalloc_end;
+EXPORT_SYMBOL(m68k_vmalloc_end);
 
 unsigned long pmeg_vaddr[PMEGS_NUM];
 unsigned char pmeg_alloc[PMEGS_NUM];
@@ -172,8 +172,8 @@ void mmu_emu_init(unsigned long bootmem_end)
 #endif
                         // the lowest mapping here is the end of our
                         // vmalloc region
-                        if(!vmalloc_end)
-                                vmalloc_end = seg;
+                        if (!m68k_vmalloc_end)
+                                m68k_vmalloc_end = seg;
 
                         // mark the segmap alloc'd, and reserve any
                         // of the first 0xbff pages the hardware is
diff --git a/arch/m68k/sun3/sun3dvma.c b/arch/m68k/sun3/sun3dvma.c
index f9277e8b4159..ca0966cac72a 100644
--- a/arch/m68k/sun3/sun3dvma.c
+++ b/arch/m68k/sun3/sun3dvma.c
@@ -8,6 +8,7 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/gfp.h>
 #include <linux/mm.h>
 #include <linux/list.h>
 
diff --git a/arch/m68k/sun3x/dvma.c b/arch/m68k/sun3x/dvma.c
index 117481e86305..d5ddcdaa2347 100644
--- a/arch/m68k/sun3x/dvma.c
+++ b/arch/m68k/sun3x/dvma.c
@@ -15,7 +15,6 @@
 #include <linux/bitops.h>
 #include <linux/mm.h>
 #include <linux/bootmem.h>
-#include <linux/slab.h>
 #include <linux/vmalloc.h>
 
 #include <asm/sun3x.h>