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 | |
| parent | 2ffb448ccbdd3de16e68220d4fa0864a75272dc3 (diff) | |
| parent | 1784f9144b143a1e8b19fe94083b040aa559182b (diff) | |
| download | linux-0-day-6ba64feff6b6dfcc4c476776375b650d744621d7.tar.gz linux-0-day-6ba64feff6b6dfcc4c476776375b650d744621d7.tar.xz | |
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
| -rw-r--r-- | drivers/misc/pti.c | 2 | ||||
| -rw-r--r-- | include/linux/intel-pti.h (renamed from include/linux/pti.h) | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/misc/pti.c b/drivers/misc/pti.c index eda38cbe85307..41f2a9f6851d9 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> diff --git a/include/linux/pti.h b/include/linux/intel-pti.h index b3ea01a3197ef..2710d72de3c92 100644 --- a/include/linux/pti.h +++ b/include/linux/intel-pti.h @@ -22,8 +22,8 @@ * interface to write out it's contents for debugging a mobile system. */ -#ifndef PTI_H_ -#define PTI_H_ +#ifndef LINUX_INTEL_PTI_H_ +#define LINUX_INTEL_PTI_H_ /* offset for last dword of any PTI message. Part of MIPI P1149.7 */ #define PTI_LASTDWORD_DTS 0x30 @@ -40,4 +40,4 @@ struct pti_masterchannel *pti_request_masterchannel(u8 type, const char *thread_name); void pti_release_masterchannel(struct pti_masterchannel *mc); -#endif /*PTI_H_*/ +#endif /* LINUX_INTEL_PTI_H_ */ |