Merge remote-tracking branch 'm68knommu/for-next'

Conflicts:
	arch/m68k/Kconfig
	arch/m68k/Kconfig.debug
	arch/m68k/kernel/Makefile

diff --cc arch/m68k/Kconfig
index 361d54019bb0bcafaed6e7e6d408d638ae4cd5c5,26ed01bdf25046769f5775471bd6ecd1aa9eb817..2914b036d76e50a21b9a0421562cb07edca09b99
--- 1/arch/m68k/Kconfig
--- 2/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@@ -3,9 -3,8 +3,8 @@@ config M68
        default y
        select HAVE_IDE
        select HAVE_AOUT if MMU
-       select GENERIC_ATOMIC64 if MMU
 -      select HAVE_GENERIC_HARDIRQS if !MMU
 -      select GENERIC_IRQ_SHOW if !MMU
 +      select HAVE_GENERIC_HARDIRQS
 +      select GENERIC_IRQ_SHOW
        select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS
  
  config RWSEM_GENERIC_SPINLOCK

diff --cc arch/m68k/Kconfig.debug
index a0c8863bd08b481bdfa27280756a578d41d947a3,af4fd5f8f8d5c9852359a47f9657bf32c395a2f9..9d4008fee6d80e9a04f022fa2cf8e078df7a366d
--- 1/arch/m68k/Kconfig.debug
--- 2/arch/m68k/Kconfig.debug
+++ b/arch/m68k/Kconfig.debug
@@@ -2,17 -2,14 +2,25 @@@ menu "Kernel hacking
  
  source "lib/Kconfig.debug"
  
 +config EARLY_PRINTK
 +      bool "Early printk" if EMBEDDED
 +      depends on MVME16x || MAC
 +      default y
 +      help
 +          Write kernel log output directly to a serial port.
 +
 +          This is useful for kernel debugging when your machine crashes very
 +          early before the console code is initialized.
 +          You should normally say N here, unless you want to debug such a crash.
 +
+ config BOOTPARAM
+       bool 'Compiled-in Kernel Boot Parameter'
+ 
+ config BOOTPARAM_STRING
+       string 'Kernel Boot Parameter'
+       default 'console=ttyS0,19200'
+       depends on BOOTPARAM
+ 
  if !MMU
  
  config FULLDEBUG

diff --cc arch/m68k/kernel/Makefile
index c5696193281a16a405be19906d649091c273de42,01ae30ea0e88d3ed92a68d8fcdae8931566fc41f..39e9c4443a840b74a551dfccda5dde019d0836ff
--- 1/arch/m68k/kernel/Makefile
--- 2/arch/m68k/kernel/Makefile
+++ b/arch/m68k/kernel/Makefile
@@@ -6,15 -6,16 +6,11 @@@ extra-$(CONFIG_MMU)   := head.
  extra-$(CONFIG_SUN3)  := sun3-head.o
  extra-y                       += vmlinux.lds
  
- obj-y := entry.o irq.o m68k_ksyms.o module.o process.o ptrace.o setup.o \
-          signal.o sys_m68k.o syscalltable.o time.o traps.o
 -obj-y := entry.o init_task.o m68k_ksyms.o module.o process.o ptrace.o
++obj-y := entry.o irq.o init_task.o m68k_ksyms.o module.o process.o ptrace.o
+ obj-y += setup.o signal.o sys_m68k.o syscalltable.o time.o traps.o
  
 -obj-$(CONFIG_MMU)     += ints.o devres.o vectors.o
 -devres-$(CONFIG_MMU)  = ../../../kernel/irq/devres.o
 +obj-$(CONFIG_MMU)     += ints.o vectors.o
  
  ifndef CONFIG_MMU_SUN3
  obj-y                 += dma.o
  endif
--ifndef CONFIG_MMU
- obj-y                 += init_task.o
 -obj-y                 += irq.o
--endif
--

diff --cc arch/m68k/kernel/entry_mm.S
index c713f514843dbbea4ef6b42dcbec445e53847def,ef813512e2e7846efd88a7cc8c0580375dd38d6e..675a854966a62df047045c8dc8fc8016530e77c6
--- 1/arch/m68k/kernel/entry_mm.S
--- 2/arch/m68k/kernel/entry_mm.S
+++ b/arch/m68k/kernel/entry_mm.S
@@@ -240,10 -248,12 +248,11 @@@ user_irqvec_fixup = . + 
  
        movel   %sp,%sp@-
        movel   %d0,%sp@-               |  put vector # on stack
 -user_irqhandler_fixup = . + 2
 -      jsr     __m68k_handle_int       |  process the IRQ
 +      jsr     do_IRQ                  |  process the IRQ
        addql   #8,%sp                  |  pop parameters off stack
  
-       subqb   #1,%curptr@(TASK_INFO+TINFO_PREEMPT+1)
+       movel   %curptr@(TASK_STACK),%a1
+       subqb   #1,%a1@(TINFO_PREEMPT+1)
        jeq     ret_from_last_interrupt
        RESTORE_ALL