diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-13 01:53:24 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-13 01:53:24 +0300 |
| commit | 6f3be0f04354185e81a006b8e4dfc307edad75e7 (patch) | |
| tree | b06fd6ecd600840fe28fd57a7ee054e844a434e0 /arch/x86 | |
| parent | 518bacf5a569d111e256d58b9fbc8d7b80ec42ea (diff) | |
| parent | 523d0fb4f05dcefed59c6325acb54adc34ee4c2d (diff) | |
| download | linux-6f3be0f04354185e81a006b8e4dfc307edad75e7.tar.xz | |
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
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/setup_percpu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c index 2bbd27f89802..9820d6d977c6 100644 --- a/arch/x86/kernel/setup_percpu.c +++ b/arch/x86/kernel/setup_percpu.c @@ -1,7 +1,7 @@ #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> |