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

Pull x86 header fixlet from Ingo Molnar:
 "Remove unnecessary module.h inclusion from core code (Paul Gortmaker)"

* 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/percpu: Remove unnecessary include of module.h, add asm/desc.h

parents 518bacf5 523d0fb4

arch/x86/kernel/setup_percpu.c

+2 −1

Original line number	Diff line number	Diff line
		#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

		#include <linux/kernel.h>
		#include <linux/module.h>
		#include <linux/export.h>
		#include <linux/init.h>
		#include <linux/bootmem.h>
		#include <linux/percpu.h>
		@@ -12,6 +12,7 @@
		#include <linux/pfn.h>
		#include <asm/sections.h>
		#include <asm/processor.h>
		#include <asm/desc.h>
		#include <asm/setup.h>
		#include <asm/mpspec.h>
		#include <asm/apicdef.h>