Merge commit 'tip/master' into xen-tip/next

* commit 'tip/master': (1150 commits)
  xen: use header for EXPORT_SYMBOL_GPL
  sched: avoid flexible array member inside struct (gcc extension)
  perf_counter: fix print debug irq disable
  genirq: fix comment to say IRQ_WAKE_THREAD
  lockdep: increase MAX_LOCKDEP_ENTRIES and MAX_LOCKDEP_CHAINS
  lockdep: increase MAX_LOCKDEP_ENTRIES
  lockdep: increase MAX_LOCKDEP_ENTRIES
  perf_counter: call hw_perf_save_disable/restore around group_sched_in
  x86: make sparse mem work in non-NUMA mode
  x86: process.c, remove useless headers
  x86: process.c, remove useless headers
  x86: make sparse mem work in non-NUMA mode
  x86: merge process.c a bit
  x86: microcode: use smp_call_function_single instead of set_cpus_allowed, cleanup of synchronization logic
  ntp: fix comment typos
  ring-buffer: move code around to remove some branches
  ring-buffer: use internal time stamp function
  ring-buffer: small optimizations
  x86, 32-bit: fix kernel_trap_sp()
  sched: Don't export sched_mc_power_savings on multi-socket single core system
  ...

Conflicts:
	arch/x86/Kconfig
	arch/x86/kernel/cpu/mcheck/mce_64.c
	arch/x86/kernel/cpu/mcheck/mce_intel_64.c
	arch/x86/kernel/traps.c
	arch/x86/mm/init.c
	arch/x86/mm/pgtable.c
	include/linux/ring_buffer.h
	kernel/sysctl.c
	kernel/trace/ring_buffer.c
	mm/page_alloc.c

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/include/asm/io_apic.h
Simple merge

diff --cc arch/x86/include/asm/microcode.h
Simple merge

diff --cc arch/x86/include/asm/msr-index.h
Simple merge

diff --cc arch/x86/include/asm/processor.h
Simple merge

diff --cc arch/x86/kernel/acpi/boot.c
index d4de1c2a3b4e0b403055e4aa25d04fb34f13b772,6ee96b5530f15e3c056d3fd44d77223ee56cc7db..2324f04e15ffbddd6940f0f91c7f7cc2bdc3389c
--- 1/arch/x86/kernel/acpi/boot.c
--- 2/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@@ -530,15 -522,11 +530,15 @@@ int acpi_gsi_to_irq(u32 gsi, unsigned i
   * success: return IRQ number (>=0)
   * failure: return < 0
   */
- int acpi_register_gsi(u32 gsi, int triggering, int polarity)
+ int acpi_register_gsi(struct device *dev, u32 gsi, int triggering, int polarity)
  {
 -      unsigned int irq;
 +      int irq;
        unsigned int plat_gsi = gsi;
  
 +      irq = xen_register_gsi(gsi, triggering, polarity);
 +      if (irq >= 0)
 +              return irq;
 +
  #ifdef CONFIG_PCI
        /*
         * Make sure all (legacy) PCI IRQs are set as level-triggered.

diff --cc arch/x86/kernel/apic/io_apic.c
Simple merge

diff --cc arch/x86/kernel/cpu/mtrr/generic.c
Simple merge

diff --cc arch/x86/kernel/microcode_core.c
index 6282736aca27c0b8c0b284db86e44556284007a8,9c4461501fcbb9618ac3ce12fef93f990b8f3955..5c1a1ab3d11ff9ef720f1032a9229a7b5a371a7b
--- 1/arch/x86/kernel/microcode_core.c
--- 2/arch/x86/kernel/microcode_core.c
+++ b/arch/x86/kernel/microcode_core.c
@@@ -89,10 -81,8 +81,9 @@@
  #include <linux/fs.h>
  #include <linux/mm.h>
  
 +#include <asm/xen/hypervisor.h>
  #include <asm/microcode.h>
  #include <asm/processor.h>
- #include <asm/msr.h>
  
  MODULE_DESCRIPTION("Microcode Update Driver");
  MODULE_AUTHOR("Tigran Aivazian <tigran@aivazian.fsnet.co.uk>");

diff --cc arch/x86/kernel/process.c
Simple merge

diff --cc arch/x86/kernel/process_32.c
Simple merge

diff --cc arch/x86/kernel/process_64.c
Simple merge

diff --cc arch/x86/pci/common.c
Simple merge

diff --cc arch/x86/pci/i386.c
Simple merge

diff --cc arch/x86/xen/mmu.c
Simple merge

diff --cc block/blk-core.c
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/xen/balloon.c
Simple merge

diff --cc drivers/xen/events.c
Simple merge

diff --cc kernel/sysctl.c
index 11d87c02a7fd695a856c4d1a5faf5de08fc08cb6,fae179f551243312d395b5f97e5921c1dfe013b5..2c6f84e9c27a8f86c15401313a82bab501c87afc
--- 1/kernel/sysctl.c
--- 2/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@@ -912,6 -915,24 +915,14 @@@ static struct ctl_table kern_table[] = 
                .child          = slow_work_sysctls,
        },
  #endif
 -#ifdef CONFIG_PERF_COUNTERS
 -      {
 -              .ctl_name       = CTL_UNNUMBERED,
 -              .procname       = "perf_counter_privileged",
 -              .data           = &sysctl_perf_counter_priv,
 -              .maxlen         = sizeof(sysctl_perf_counter_priv),
 -              .mode           = 0644,
 -              .proc_handler   = &proc_dointvec,
 -      },
+       {
+               .ctl_name       = CTL_UNNUMBERED,
+               .procname       = "perf_counter_mlock_kb",
+               .data           = &sysctl_perf_counter_mlock,
+               .maxlen         = sizeof(sysctl_perf_counter_mlock),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec,
+       },
 -#endif
  /*
   * NOTE: do not add new entries to this table unless you have read
   * Documentation/sysctl/ctl_unnumbered.txt
@@@ -1304,6 -1325,6 +1315,16 @@@ static struct ctl_table vm_table[] = 
                .proc_handler   = &proc_dointvec,
        },
  #endif
++#ifdef CONFIG_KMEMCHECK
++      {
++              .ctl_name       = CTL_UNNUMBERED,
++              .procname       = "kmemcheck",
++              .data           = &kmemcheck_enabled,
++              .maxlen         = sizeof(int),
++              .mode           = 0644,
++              .proc_handler   = &proc_dointvec,
++      },
++#endif
  #ifdef CONFIG_UNEVICTABLE_LRU
        {
                .ctl_name       = CTL_UNNUMBERED,

diff --cc kernel/trace/trace_events.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge