diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-17 13:54:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-17 13:54:31 -0800 |
| commit | 6ba64feff6b6dfcc4c476776375b650d744621d7 (patch) | |
| tree | a63ff058879dd90b81b5a3c7fbf9d371db7151cf /drivers/misc | |
| parent | Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| parent | drivers/misc/intel/pti: Rename the header file to free up the namespace (diff) | |
| download | linux-dev-6ba64feff6b6dfcc4c476776375b650d744621d7.tar.xz linux-dev-6ba64feff6b6dfcc4c476776375b650d744621d7.zip | |
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.c | 2 |
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> |