summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/bugs.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2017-03-24 16:40:26 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2017-03-24 16:40:26 +1100
commit1331845e45f1524a8789d4b03a9636f81aff3f33 (patch)
tree7d0c87d57daabcb72ad5a5b7de69d6236c8f15e2 /arch/x86/kernel/cpu/bugs.c
parentcb051c970960402ddb2df556911e323a215922ca (diff)
parentff4eb5d0c322d4e5e92917557e3b954431dd1aec (diff)
downloadlinux-1331845e45f1524a8789d4b03a9636f81aff3f33.tar.gz
linux-1331845e45f1524a8789d4b03a9636f81aff3f33.tar.xz
Merge branch 'akpm/master'
Diffstat (limited to 'arch/x86/kernel/cpu/bugs.c')
-rw-r--r--arch/x86/kernel/cpu/bugs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index a44ef52184df..0af86d9242da 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -17,7 +17,7 @@
#include <asm/paravirt.h>
#include <asm/alternative.h>
#include <asm/pgtable.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
void __init check_bugs(void)
{