Merge branch 'auto-perfcounters-next' into auto-latest

Conflicts:
	arch/x86/kernel/irqinit.c
	arch/x86/kernel/irqinit_64.c
	arch/x86/kernel/traps.c
	arch/x86/mm/fault.c

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

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

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

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

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

diff --cc arch/x86/kernel/entry_64.S
Simple merge

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

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

diff --cc arch/x86/mm/fault.c
index 3d1b942f3eebdb7b50d883d1e7fba6028a6514b4,6f9df2babe487c4bfb9df2de78f346762c877f6a..f9b252c3310aaeef3bb07caf009e328277f84870
--- 1/arch/x86/mm/fault.c
--- 2/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@@ -3,17 -3,41 +3,18 @@@
   *  Copyright (C) 2001, 2002 Andi Kleen, SuSE Labs.
   *  Copyright (C) 2008-2009, Red Hat Inc., Ingo Molnar
   */
 -#include <linux/interrupt.h>
 -#include <linux/mmiotrace.h>
 -#include <linux/bootmem.h>
 -#include <linux/compiler.h>
 -#include <linux/highmem.h>
 -#include <linux/kprobes.h>
 -#include <linux/uaccess.h>
 -#include <linux/vmalloc.h>
 -#include <linux/vt_kern.h>
 -#include <linux/signal.h>
 -#include <linux/kernel.h>
 -#include <linux/ptrace.h>
 -#include <linux/string.h>
 -#include <linux/module.h>
 -#include <linux/kdebug.h>
 -#include <linux/errno.h>
 -#include <linux/magic.h>
 -#include <linux/sched.h>
 -#include <linux/types.h>
 -#include <linux/init.h>
 -#include <linux/mman.h>
 -#include <linux/tty.h>
 -#include <linux/smp.h>
 -#include <linux/mm.h>
 -#include <linux/perf_counter.h>
 -
 -#include <asm-generic/sections.h>
 -
 -#include <asm/tlbflush.h>
 -#include <asm/pgalloc.h>
 -#include <asm/segment.h>
 -#include <asm/system.h>
 -#include <asm/proto.h>
 -#include <asm/traps.h>
 -#include <asm/desc.h>
 +#include <linux/magic.h>              /* STACK_END_MAGIC              */
 +#include <linux/sched.h>              /* test_thread_flag(), ...      */
 +#include <linux/kdebug.h>             /* oops_begin/end, ...          */
 +#include <linux/module.h>             /* search_exception_table       */
 +#include <linux/bootmem.h>            /* max_low_pfn                  */
 +#include <linux/kprobes.h>            /* __kprobes, ...               */
 +#include <linux/mmiotrace.h>          /* kmmio_handler, ...           */
++#include <linux/perf_counter.h>               /* perf_swcounter_*(), ...      */
 +
 +#include <asm/traps.h>                        /* dotraplinkage, ...           */
 +#include <asm/pgalloc.h>              /* pgd_*(), ...                 */
 +#include <asm/kmemcheck.h>            /* kmemcheck_*(), ...           */
  
  /*
   * Page fault error code bits:

diff --cc arch/x86/oprofile/nmi_int.c
Simple merge

diff --cc include/linux/init_task.h
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc kernel/Makefile
index a35eee3436de081a7a35d9b8184a9349facee17d,e914ca992d70c74b99ee4ac4a6f0c980f2ac7230..90b53f6dc226c674d9b05eee60bcc671bab0edc9
--- 1/kernel/Makefile
--- 2/kernel/Makefile
+++ b/kernel/Makefile
@@@ -93,9 -93,9 +93,10 @@@ obj-$(CONFIG_LATENCYTOP) += latencytop.
  obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o
  obj-$(CONFIG_FUNCTION_TRACER) += trace/
  obj-$(CONFIG_TRACING) += trace/
 +obj-$(CONFIG_X86_DS) += trace/
  obj-$(CONFIG_SMP) += sched_cpupri.o
  obj-$(CONFIG_SLOW_WORK) += slow-work.o
+ obj-$(CONFIG_PERF_COUNTERS) += perf_counter.o
  
  ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y)
  # According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is

diff --cc kernel/exit.c
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/mutex.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc kernel/timer.c
Simple merge