Merge branch 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

Pull x86 header cleanups from Ingo Molnar:
 "This tree is a cleanup of the x86 tree reducing spurious uses of
  module.h - which should improve build performance a bit"

* 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, crypto: Restore MODULE_LICENSE() to glue_helper.c so it loads
  x86/apic: Remove duplicated include from probe_64.c
  x86/ce4100: Remove duplicated include from ce4100.c
  x86/headers: Include spinlock_types.h in x8664_ksyms_64.c for missing spinlock_t
  x86/platform: Delete extraneous MODULE_* tags fromm ts5500
  x86: Audit and remove any remaining unnecessary uses of module.h
  x86/kvm: Audit and remove any unnecessary uses of module.h
  x86/xen: Audit and remove any unnecessary uses of module.h
  x86/platform: Audit and remove any unnecessary uses of module.h
  x86/lib: Audit and remove any unnecessary uses of module.h
  x86/kernel: Audit and remove any unnecessary uses of module.h
  x86/mm: Audit and remove any unnecessary uses of module.h
  x86: Don't use module.h just for AUTHOR / LICENSE tags

diff --cc arch/x86/events/amd/ibs.c
Simple merge

diff --cc arch/x86/events/core.c
Simple merge

diff --cc arch/x86/events/intel/uncore.c
index 3f3d0d6,95726cd..463dc7a
--- 1/arch/x86/events/intel/uncore.c
--- 2/arch/x86/events/intel/uncore.c
+++ b/arch/x86/events/intel/uncore.c
@@@ -1,5 -1,6 +1,7 @@@
+ #include <linux/module.h>
+ 
  #include <asm/cpu_device_id.h>
 +#include <asm/intel-family.h>
  #include "uncore.h"
  
  static struct intel_uncore_type *empty_uncore[] = { NULL, };

diff --cc arch/x86/events/intel/uncore.h
Simple merge

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

diff --cc arch/x86/kernel/acpi/boot.c
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc arch/x86/kvm/cpuid.c
Simple merge

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc arch/x86/lib/csum-wrappers_64.c
index b6fcb9a,f8dc05d..8bd5358
--- 1/arch/x86/lib/csum-wrappers_64.c
--- 2/arch/x86/lib/csum-wrappers_64.c
+++ b/arch/x86/lib/csum-wrappers_64.c
@@@ -5,8 -5,7 +5,8 @@@
   * Wrappers of assembly checksum functions for x86-64.
   */
  #include <asm/checksum.h>
- #include <linux/module.h>
+ #include <linux/export.h>
 +#include <linux/uaccess.h>
  #include <asm/smap.h>
  
  /**

diff --cc arch/x86/lib/usercopy_64.c
index 9f760cd,e1e0364..6987358
--- 1/arch/x86/lib/usercopy_64.c
--- 2/arch/x86/lib/usercopy_64.c
+++ b/arch/x86/lib/usercopy_64.c
@@@ -5,8 -5,8 +5,8 @@@
   * Copyright 1997 Linus Torvalds
   * Copyright 2002 Andi Kleen <ak@suse.de>
   */
- #include <linux/module.h>
+ #include <linux/export.h>
 -#include <asm/uaccess.h>
 +#include <linux/uaccess.h>
  
  /*
   * Zero Userspace

diff --cc arch/x86/mm/dump_pagetables.c
Simple merge

diff --cc arch/x86/mm/init_64.c
Simple merge

diff --cc arch/x86/mm/numa.c
Simple merge

diff --cc arch/x86/mm/pat.c
Simple merge

diff --cc arch/x86/mm/pgtable_32.c
Simple merge

diff --cc arch/x86/mm/srat.c
index b1ecff4,fd0e963..35fe695
--- 1/arch/x86/mm/srat.c
--- 2/arch/x86/mm/srat.c
+++ b/arch/x86/mm/srat.c
@@@ -13,8 -13,10 +13,8 @@@
  #include <linux/acpi.h>
  #include <linux/mmzone.h>
  #include <linux/bitmap.h>
- #include <linux/module.h>
+ #include <linux/init.h>
  #include <linux/topology.h>
 -#include <linux/bootmem.h>
 -#include <linux/memblock.h>
  #include <linux/mm.h>
  #include <asm/proto.h>
  #include <asm/numa.h>

diff --cc arch/x86/platform/efi/efi_64.c
Simple merge

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