patches/kernel/0120-drivers-misc-intel-pti-Rename-the-header-file-to-fre.patch

   1 From b46c055fd71f53c0a80cf592805943193438104c Mon Sep 17 00:00:00 2001
   2 From: Ingo Molnar <mingo@kernel.org>
   3 Date: Tue, 5 Dec 2017 14:14:47 +0100
   4 Subject: [PATCH 120/233] drivers/misc/intel/pti: Rename the header file to
   5  free up the namespace
   6 MIME-Version: 1.0
   7 Content-Type: text/plain; charset=UTF-8
   8 Content-Transfer-Encoding: 8bit
   9
  10 CVE-2017-5754
  11
  12 We'd like to use the 'PTI' acronym for 'Page Table Isolation' - free up the
  13 namespace by renaming the <linux/pti.h> driver header to <linux/intel-pti.h>.
  14
  15 (Also standardize the header guard name while at it.)
  16
  17 Cc: Peter Zijlstra <peterz@infradead.org>
  18 Cc: Thomas Gleixner <tglx@linutronix.de>
  19 Cc: J Freyensee <james_p_freyensee@linux.intel.com>
  20 Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  21 Cc: linux-kernel@vger.kernel.org
  22 Signed-off-by: Ingo Molnar <mingo@kernel.org>
  23 (cherry picked from commit 1784f9144b143a1e8b19fe94083b040aa559182b)
  24 Signed-off-by: Andy Whitcroft <apw@canonical.com>
  25 Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
  26 (cherry picked from commit fc05996d0900765640d56179acd2f5d052ad33e2)
  27 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  28 ---
  29  include/linux/{pti.h => intel-pti.h} | 6 +++---
  30  drivers/misc/pti.c                   | 2 +-
  31  2 files changed, 4 insertions(+), 4 deletions(-)
  32  rename include/linux/{pti.h => intel-pti.h} (94%)
  33
  34 diff --git a/include/linux/pti.h b/include/linux/intel-pti.h
  35 similarity index 94%
  36 rename from include/linux/pti.h
  37 rename to include/linux/intel-pti.h
  38 index b3ea01a3197e..2710d72de3c9 100644
  39 --- a/include/linux/pti.h
  40 +++ b/include/linux/intel-pti.h
  41 @@ -22,8 +22,8 @@
  42   * interface to write out it's contents for debugging a mobile system.
  43   */
  44
  45 -#ifndef PTI_H_
  46 -#define PTI_H_
  47 +#ifndef LINUX_INTEL_PTI_H_
  48 +#define LINUX_INTEL_PTI_H_
  49
  50  /* offset for last dword of any PTI message. Part of MIPI P1149.7 */
  51  #define PTI_LASTDWORD_DTS      0x30
  52 @@ -40,4 +40,4 @@ struct pti_masterchannel *pti_request_masterchannel(u8 type,
  53                                                     const char *thread_name);
  54  void pti_release_masterchannel(struct pti_masterchannel *mc);
  55
  56 -#endif /*PTI_H_*/
  57 +#endif /* LINUX_INTEL_PTI_H_ */
  58 diff --git a/drivers/misc/pti.c b/drivers/misc/pti.c
  59 index eda38cbe8530..41f2a9f6851d 100644
  60 --- a/drivers/misc/pti.c
  61 +++ b/drivers/misc/pti.c
  62 @@ -32,7 +32,7 @@
  63  #include <linux/pci.h>
  64  #include <linux/mutex.h>
  65  #include <linux/miscdevice.h>
  66 -#include <linux/pti.h>
  67 +#include <linux/intel-pti.h>
  68  #include <linux/slab.h>
  69  #include <linux/uaccess.h>
  70
  71 --
  72 2.14.2
  73