diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-01-25 03:16:14 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-01-25 03:16:14 -0500 |
| commit | 2b45e0f9f34f718725e093f4e335600811d7105a (patch) | |
| tree | 3c6d594539eb16fc955906da65b9fa7aacbc9145 /arch/x86/include/asm/smp.h | |
| parent | a85eba8814631d0d48361c8b9a7ee0984e80c03c (diff) | |
| parent | 15c81026204da897a05424c79263aea861a782cc (diff) | |
Merge branch 'linus' into x86/urgent
Merge in the x86 changes to apply a fix.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/smp.h')
| -rw-r--r-- | arch/x86/include/asm/smp.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h index 4137890e88e3..8cd27e08e23c 100644 --- a/arch/x86/include/asm/smp.h +++ b/arch/x86/include/asm/smp.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #define _ASM_X86_SMP_H | 2 | #define _ASM_X86_SMP_H |
| 3 | #ifndef __ASSEMBLY__ | 3 | #ifndef __ASSEMBLY__ |
| 4 | #include <linux/cpumask.h> | 4 | #include <linux/cpumask.h> |
| 5 | #include <linux/init.h> | ||
| 6 | #include <asm/percpu.h> | 5 | #include <asm/percpu.h> |
| 7 | 6 | ||
| 8 | /* | 7 | /* |