korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-28 06:34:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'WIP.x86-pti.base.prep-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Browse Source 
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
This commit is contained in:
Linus Torvalds 2017-12-17 13:54:31 -08:00
commit 6ba64feff6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/misc/pti.c
View File

@ -32,7 +32,7 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/miscdevice.h> #include <linux/miscdevice.h>
#include <linux/pti.h> #include <linux/intel-pti.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>

6
include/linux/pti.h → include/linux/intel-pti.h
View File

@ -22,8 +22,8 @@
* interface to write out it's contents for debugging a mobile system. * interface to write out it's contents for debugging a mobile system.
*/ */
#ifndef PTI_H_ #ifndef LINUX_INTEL_PTI_H_
#define PTI_H_ #define LINUX_INTEL_PTI_H_
/* offset for last dword of any PTI message. Part of MIPI P1149.7 */ /* offset for last dword of any PTI message. Part of MIPI P1149.7 */
#define PTI_LASTDWORD_DTS 0x30 #define PTI_LASTDWORD_DTS 0x30
@ -40,4 +40,4 @@ struct pti_masterchannel *pti_request_masterchannel(u8 type,
const char *thread_name); const char *thread_name);
void pti_release_masterchannel(struct pti_masterchannel *mc); void pti_release_masterchannel(struct pti_masterchannel *mc);
#endif /*PTI_H_*/ #endif /* LINUX_INTEL_PTI_H_ */