From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 23 Oct 2011 20:26:22 +0000 (+0100)
Subject: Merge branch 'misc' into for-next
X-Git-Tag: next-20111025~112^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8122ad4a288ecac39063af10d260e9b5f44daaf2;p=karo-tx-linux.git

Merge branch 'misc' into for-next

Conflicts:
	arch/arm/mach-integrator/integrator_ap.c
---

8122ad4a288ecac39063af10d260e9b5f44daaf2
diff --cc arch/arm/Kconfig
index 3a012100e8f1,1412da8ccf05..0143e2e02902
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -205,13 -204,21 +205,17 @@@ config ARM_PATCH_PHYS_VIR
  	  kernel in system memory.
  
  	  This can only be used with non-XIP MMU kernels where the base
 -	  of physical memory is at a 16MB boundary, or theoretically 64K
 -	  for the MSM machine class.
 +	  of physical memory is at a 16MB boundary.
 +
 +	  Only disable this option if you know that you do not require
 +	  this feature (eg, building a kernel for a single machine) and
 +	  you need to shrink the kernel to the minimal size.
  
 -config ARM_PATCH_PHYS_VIRT_16BIT
 -	def_bool y
 -	depends on ARM_PATCH_PHYS_VIRT && ARCH_MSM
 -	help
 -	  This option extends the physical to virtual translation patching
 -	  to allow physical memory down to a theoretical minimum of 64K
 -	  boundaries.
  
+ config GENERIC_BUG
+ 	def_bool y
+ 	depends on BUG
+ 
  source "init/Kconfig"
  
  source "kernel/Kconfig.freezer"
diff --cc arch/arm/kernel/vmlinux.lds.S
index 4e66f62b8d41,7b2541efd9f8..20b3041e0860
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@@ -21,12 -21,11 +21,13 @@@
  #define ARM_CPU_KEEP(x)
  #endif
  
- #if defined(CONFIG_SMP_ON_UP) && !defined(CONFIG_DEBUG_SPINLOCK)
+ #if (defined(CONFIG_SMP_ON_UP) && !defined(CONFIG_DEBUG_SPINLOCK)) || \
+ 	defined(CONFIG_GENERIC_BUG)
  #define ARM_EXIT_KEEP(x)	x
 +#define ARM_EXIT_DISCARD(x)
  #else
  #define ARM_EXIT_KEEP(x)
 +#define ARM_EXIT_DISCARD(x)	x
  #endif
  
  OUTPUT_ARCH(arm)
diff --cc arch/arm/mach-integrator/integrator_ap.c
index 8cdc730dcb3a,8dca5a7ab370..f2119908a0b3
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@@ -32,7 -32,7 +32,8 @@@
  #include <linux/interrupt.h>
  #include <linux/io.h>
  #include <linux/mtd/physmap.h>
+ #include <linux/clk.h>
 +#include <video/vga.h>
  
  #include <mach/hardware.h>
  #include <mach/platform.h>