From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 14 Nov 2011 00:03:03 +0000 (+1100)
Subject: Merge remote-tracking branch 'm68knommu/for-next'
X-Git-Tag: next-20111114~63
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d745a05f9df90c3db5ee142ce16c74480ae19600;p=karo-tx-linux.git

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

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

d745a05f9df90c3db5ee142ce16c74480ae19600
diff --cc arch/m68k/Kconfig
index 361d54019bb0,26ed01bdf250..2914b036d76e
--- a/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 a0c8863bd08b,af4fd5f8f8d5..9d4008fee6d8
--- a/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 c5696193281a,01ae30ea0e88..39e9c4443a84
--- a/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 c713f514843d,ef813512e2e7..675a854966a6
--- a/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