From: Len Brown <len.brown@intel.com>
Date: Wed, 3 Aug 2011 15:30:42 +0000 (-0400)
Subject: Merge branch 'apei' into apei-release
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d0e323b47057f4492b8fa22345f38d80a469bf8d;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'apei' into apei-release

Some trivial conflicts due to other various merges
adding to the end of common lists sooner than this one.

	arch/ia64/Kconfig
	arch/powerpc/Kconfig
	arch/x86/Kconfig
	lib/Kconfig
	lib/Makefile

Signed-off-by: Len Brown <len.brown@intel.com>
---

d0e323b47057f4492b8fa22345f38d80a469bf8d
diff --cc arch/ia64/Kconfig
index 64c7ab7e7a81,b1227ddc672a..124854714958
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@@ -27,7 -27,7 +27,8 @@@ config IA6
  	select GENERIC_PENDING_IRQ if SMP
  	select IRQ_PER_CPU
  	select GENERIC_IRQ_SHOW
 +	select ARCH_WANT_OPTIONAL_GPIOLIB
+ 	select ARCH_HAVE_NMI_SAFE_CMPXCHG
  	default y
  	help
  	  The Itanium Processor Family is Intel's 64-bit successor to
diff --cc arch/powerpc/Kconfig
index 374c475e56a3,e55f754dd50d..6926b61acfea
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -134,8 -134,7 +134,9 @@@ config PP
  	select GENERIC_IRQ_SHOW_LEVEL
  	select HAVE_RCU_TABLE_FREE if SMP
  	select HAVE_SYSCALL_TRACEPOINTS
 +	select HAVE_BPF_JIT if (PPC64 && NET)
 +	select HAVE_ARCH_JUMP_LABEL
+ 	select ARCH_HAVE_NMI_SAFE_CMPXCHG
  
  config EARLY_PRINTK
  	bool
diff --cc arch/x86/Kconfig
index 7cf916fc1ce7,a680a60898de..6a47bb22657f
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -71,7 -70,7 +71,8 @@@ config X8
  	select IRQ_FORCED_THREADING
  	select USE_GENERIC_SMP_HELPERS if SMP
  	select HAVE_BPF_JIT if (X86_64 && NET)
 +	select CLKEVT_I8253
+ 	select ARCH_HAVE_NMI_SAFE_CMPXCHG
  
  config INSTRUCTION_DECODER
  	def_bool (KPROBES || PERF_EVENTS)
diff --cc include/linux/bitmap.h
index 3bac44cce142,907dd58aa228..7ad634501e48
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
@@@ -144,8 -144,8 +144,9 @@@ extern int bitmap_find_free_region(unsi
  extern void bitmap_release_region(unsigned long *bitmap, int pos, int order);
  extern int bitmap_allocate_region(unsigned long *bitmap, int pos, int order);
  extern void bitmap_copy_le(void *dst, const unsigned long *src, int nbits);
 +extern int bitmap_ord_to_pos(const unsigned long *bitmap, int n, int bits);
  
+ #define BITMAP_FIRST_WORD_MASK(start) (~0UL << ((start) % BITS_PER_LONG))
  #define BITMAP_LAST_WORD_MASK(nbits)					\
  (									\
  	((nbits) % BITS_PER_LONG) ?					\
diff --cc lib/Kconfig
index 32f3e5ae2be5,25c19678a30f..6c695ff9caba
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@@ -269,11 -262,7 +269,14 @@@ config AVERAG
  
  	  If unsure, say N.
  
 +config CORDIC
 +	tristate "Cordic function"
 +	help
 +	  The option provides arithmetic function using cordic algorithm
 +	  so its calculations are in fixed point. Modules can select this
 +	  when they require this function. Module will be called cordic.
 +
+ config LLIST
+ 	bool
+ 
  endmenu
diff --cc lib/Makefile
index 892f4e282ea1,d770b817202e..6457af4a7caf
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -113,8 -112,8 +113,10 @@@ obj-$(CONFIG_AVERAGE) += average.
  
  obj-$(CONFIG_CPU_RMAP) += cpu_rmap.o
  
 +obj-$(CONFIG_CORDIC) += cordic.o
 +
+ obj-$(CONFIG_LLIST) += llist.o
+ 
  hostprogs-y	:= gen_crc32table
  clean-files	:= crc32table.h