From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 29 Mar 2012 21:28:26 +0000 (-0700)
Subject: Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: MMI-PSA29.97-13-9~17125
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6b8212a313dae341ef3a2e413dfec5c4dea59617;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'x86-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 updates from Ingo Molnar.

This touches some non-x86 files due to the sanitized INLINE_SPIN_UNLOCK
config usage.

Fixed up trivial conflicts due to just header include changes (removing
headers due to cpu_idle() merge clashing with the <asm/system.h> split).

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/apic/amd: Be more verbose about LVT offset assignments
  x86, tls: Off by one limit check
  x86/ioapic: Add io_apic_ops driver layer to allow interception
  x86/olpc: Add debugfs interface for EC commands
  x86: Merge the x86_32 and x86_64 cpu_idle() functions
  x86/kconfig: Remove CONFIG_TR=y from the defconfigs
  x86: Stop recursive fault in print_context_stack after stack overflow
  x86/io_apic: Move and reenable irq only when CONFIG_GENERIC_PENDING_IRQ=y
  x86/apic: Add separate apic_id_valid() functions for selected apic drivers
  locking/kconfig: Simplify INLINE_SPIN_UNLOCK usage
  x86/kconfig: Update defconfigs
  x86: Fix excessive MSR print out when show_msr is not specified
---

6b8212a313dae341ef3a2e413dfec5c4dea59617
diff --cc arch/x86/kernel/process_32.c
index aae4f4bbbe88,ea207c245aa4..ae6847303e26
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@@ -38,9 -36,9 +36,8 @@@
  #include <linux/uaccess.h>
  #include <linux/io.h>
  #include <linux/kdebug.h>
- #include <linux/cpuidle.h>
  
  #include <asm/pgtable.h>
 -#include <asm/system.h>
  #include <asm/ldt.h>
  #include <asm/processor.h>
  #include <asm/i387.h>
@@@ -57,8 -55,6 +54,7 @@@
  #include <asm/idle.h>
  #include <asm/syscalls.h>
  #include <asm/debugreg.h>
- #include <asm/nmi.h>
 +#include <asm/switch_to.h>
  
  asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
  
diff --cc arch/x86/kernel/process_64.c
index 61270e8d428a,ce5e34f2beca..2b154da0b6d3
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@@ -37,9 -35,9 +35,8 @@@
  #include <linux/uaccess.h>
  #include <linux/io.h>
  #include <linux/ftrace.h>
- #include <linux/cpuidle.h>
  
  #include <asm/pgtable.h>
 -#include <asm/system.h>
  #include <asm/processor.h>
  #include <asm/i387.h>
  #include <asm/fpu-internal.h>
@@@ -51,8 -49,6 +48,7 @@@
  #include <asm/idle.h>
  #include <asm/syscalls.h>
  #include <asm/debugreg.h>
- #include <asm/nmi.h>
 +#include <asm/switch_to.h>
  
  asmlinkage extern void ret_from_fork(void);