Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aeb35d6b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/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
parents 7a66ecfd a47177d3

arch/x86/events/amd/ibs.c

+2 −1
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ 
 */



#include <linux/perf_event.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/export.h>

#include <linux/pci.h>

#include <linux/ptrace.h>

#include <linux/syscore_ops.h>

arch/x86/events/amd/iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
 */



#include <linux/perf_event.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/cpumask.h>

#include <linux/slab.h>

arch/x86/events/core.c

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
#include <linux/notifier.h>

#include <linux/hardirq.h>

#include <linux/kprobes.h>

#include <linux/module.h>

#include <linux/export.h>

#include <linux/init.h>

#include <linux/kdebug.h>

#include <linux/sched.h>

#include <linux/uaccess.h>

arch/x86/events/intel/uncore.c

+2 −0
Original line number Diff line number Diff line 
#include <linux/module.h>



#include <asm/cpu_device_id.h>

#include <asm/intel-family.h>

#include "uncore.h"

arch/x86/events/intel/uncore.h

+0 −1
Original line number Diff line number Diff line 
#include <linux/module.h>

#include <linux/slab.h>

#include <linux/pci.h>

#include <asm/apicdef.h>