Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

Pull tile bugfix from Chris Metcalf:
 "This fixes a bug that Sudip's buildbot found for tilepro allmodconfig.

  I've tagged it for stable only back to 3.19, which was when most of
  the other affected architectures added their support for working
  around this issue"

* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  tile: provide CONFIG_PAGE_SIZE_64KB etc for tilepro

2 files changed, 10 insertions, 9 deletions

diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index 106c21bd7f44..8ec7a4599c08 100644
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -176,8 +176,6 @@ config NR_CPUS
           smaller kernel memory footprint results from using a smaller
           value on chips with fewer tiles.
 
-if TILEGX
-
 choice
         prompt "Kernel page size"
         default PAGE_SIZE_64KB
@@ -188,8 +186,11 @@ choice
           connections, etc., it may be better to select 16KB, which uses
           memory more efficiently at some cost in TLB performance.
 
-          Note that this option is TILE-Gx specific; currently
-          TILEPro page size is set by rebuilding the hypervisor.
+          Note that for TILEPro, you must also rebuild the hypervisor
+          with a matching page size.
+
+config PAGE_SIZE_4KB
+        bool "4KB" if TILEPRO
 
 config PAGE_SIZE_16KB
         bool "16KB"
@@ -199,8 +200,6 @@ config PAGE_SIZE_64KB
 
 endchoice
 
-endif
-
 source "kernel/Kconfig.hz"
 
 config KEXEC
diff --git a/arch/tile/include/asm/page.h b/arch/tile/include/asm/page.h
index a213a8d84a95..8eca6a0e1762 100644
--- a/arch/tile/include/asm/page.h
+++ b/arch/tile/include/asm/page.h
@@ -20,15 +20,17 @@
 #include <arch/chip.h>
 
 /* PAGE_SHIFT and HPAGE_SHIFT determine the page sizes. */
-#if defined(CONFIG_PAGE_SIZE_16KB)
+#if defined(CONFIG_PAGE_SIZE_4KB)  /* tilepro only */
+#define PAGE_SHIFT      12
+#define CTX_PAGE_FLAG   HV_CTX_PG_SM_4K
+#elif defined(CONFIG_PAGE_SIZE_16KB)
 #define PAGE_SHIFT      14
 #define CTX_PAGE_FLAG   HV_CTX_PG_SM_16K
 #elif defined(CONFIG_PAGE_SIZE_64KB)
 #define PAGE_SHIFT      16
 #define CTX_PAGE_FLAG   HV_CTX_PG_SM_64K
 #else
-#define PAGE_SHIFT      HV_LOG2_DEFAULT_PAGE_SIZE_SMALL
-#define CTX_PAGE_FLAG   0
+#error Page size not specified in Kconfig
 #endif
 #define HPAGE_SHIFT     HV_LOG2_DEFAULT_PAGE_SIZE_LARGE