summaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-12-17 13:54:31 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-12-17 13:54:31 -0800
commit6ba64feff6b6dfcc4c476776375b650d744621d7 (patch)
treea63ff058879dd90b81b5a3c7fbf9d371db7151cf /drivers/misc
parent2ffb448ccbdd3de16e68220d4fa0864a75272dc3 (diff)
parent1784f9144b143a1e8b19fe94083b040aa559182b (diff)
downloadlinux-6ba64feff6b6dfcc4c476776375b650d744621d7.tar.bz2
Merge branch 'WIP.x86-pti.base.prep-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull Page Table Isolation (PTI) preparatory tree from Ingo Molnar: "This does a rename to free up linux/pti.h to be used by the upcoming page table isolation feature" * 'WIP.x86-pti.base.prep-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: drivers/misc/intel/pti: Rename the header file to free up the namespace
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/pti.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/pti.c b/drivers/misc/pti.c
index eda38cbe8530..41f2a9f6851d 100644
--- a/drivers/misc/pti.c
+++ b/drivers/misc/pti.c
@@ -32,7 +32,7 @@
#include <linux/pci.h>
#include <linux/mutex.h>
#include <linux/miscdevice.h>
-#include <linux/pti.h>
+#include <linux/intel-pti.h>
#include <linux/slab.h>
#include <linux/uaccess.h>