From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 1 Aug 2016 18:23:42 +0000 (-0400)
Subject: Merge branch 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=aeb35d6b74174ed08daab84e232b456bbd89d1d9;p=deliverable%2Flinux.git

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

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
---

aeb35d6b74174ed08daab84e232b456bbd89d1d9
diff --cc arch/x86/events/intel/uncore.c
index 3f3d0d67749b,95726cd469dd..463dc7a5a6c3
--- a/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/lib/csum-wrappers_64.c
index b6fcb9a9ddbc,f8dc05d0881e..8bd53589ecfb
--- a/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 9f760cdcaf40,e1e0364cb9dd..69873589c0ba
--- a/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/srat.c
index b1ecff460a46,fd0e963f4285..35fe69529bc1
--- a/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>