Merge branch 'WIP.x86-pti.base.prep-for-linus' of... (6ba64fef) · Commits · 戴 / test

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

drivers/misc/pti.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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>

include/linux/pti.h→include/linux/intel-pti.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -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_ */

Admin message