1 files changed, 3 insertions, 26 deletions

diff --git a/arch/tile/mm/homecache.c b/arch/tile/mm/homecache.c
index e3ee55b0327a..004ba568d93f 100644
--- a/arch/tile/mm/homecache.c
+++ b/arch/tile/mm/homecache.c
@@ -43,12 +43,9 @@
 #include "migrate.h"
 
 
-#if CHIP_HAS_COHERENT_LOCAL_CACHE()
-
 /*
  * The noallocl2 option suppresses all use of the L2 cache to cache
- * locally from a remote home.  There's no point in using it if we
- * don't have coherent local caching, though.
+ * locally from a remote home.
  */
 static int __write_once noallocl2;
 static int __init set_noallocl2(char *str)
@@ -58,12 +55,6 @@ static int __init set_noallocl2(char *str)
 }
 early_param("noallocl2", set_noallocl2);
 
-#else
-
-#define noallocl2 0
-
-#endif
-
 
 /*
  * Update the irq_stat for cpus that we are going to interrupt
@@ -265,10 +256,8 @@ static int pte_to_home(pte_t pte)
                 return PAGE_HOME_INCOHERENT;
         case HV_PTE_MODE_UNCACHED:
                 return PAGE_HOME_UNCACHED;
-#if CHIP_HAS_CBOX_HOME_MAP()
         case HV_PTE_MODE_CACHE_HASH_L3:
                 return PAGE_HOME_HASH;
-#endif
         }
         panic("Bad PTE %#llx\n", pte.val);
 }
@@ -325,20 +314,16 @@ pte_t pte_set_home(pte_t pte, int home)
                                                       HV_PTE_MODE_CACHE_NO_L3);
                         }
                 } else
-#if CHIP_HAS_CBOX_HOME_MAP()
                 if (hash_default)
                         pte = hv_pte_set_mode(pte, HV_PTE_MODE_CACHE_HASH_L3);
                 else
-#endif
                         pte = hv_pte_set_mode(pte, HV_PTE_MODE_CACHE_NO_L3);
                 pte = hv_pte_set_nc(pte);
                 break;
 
-#if CHIP_HAS_CBOX_HOME_MAP()
         case PAGE_HOME_HASH:
                 pte = hv_pte_set_mode(pte, HV_PTE_MODE_CACHE_HASH_L3);
                 break;
-#endif
 
         default:
                 BUG_ON(home < 0 || home >= NR_CPUS ||
@@ -348,7 +333,6 @@ pte_t pte_set_home(pte_t pte, int home)
                 break;
         }
 
-#if CHIP_HAS_NC_AND_NOALLOC_BITS()
         if (noallocl2)
                 pte = hv_pte_set_no_alloc_l2(pte);
 
@@ -357,7 +341,6 @@ pte_t pte_set_home(pte_t pte, int home)
             hv_pte_get_mode(pte) == HV_PTE_MODE_CACHE_NO_L3) {
                 pte = hv_pte_set_mode(pte, HV_PTE_MODE_UNCACHED);
         }
-#endif
 
         /* Checking this case here gives a better panic than from the hv. */
         BUG_ON(hv_pte_get_mode(pte) == 0);
@@ -373,16 +356,10 @@ EXPORT_SYMBOL(pte_set_home);
  * so they're not suitable for anything but infrequent use.
  */
 
-#if CHIP_HAS_CBOX_HOME_MAP()
-static inline int initial_page_home(void) { return PAGE_HOME_HASH; }
-#else
-static inline int initial_page_home(void) { return 0; }
-#endif
-
 int page_home(struct page *page)
 {
         if (PageHighMem(page)) {
-                return initial_page_home();
+                return PAGE_HOME_HASH;
         } else {
                 unsigned long kva = (unsigned long)page_address(page);
                 return pte_to_home(*virt_to_kpte(kva));
@@ -438,7 +415,7 @@ struct page *homecache_alloc_pages_node(int nid, gfp_t gfp_mask,
 void __homecache_free_pages(struct page *page, unsigned int order)
 {
         if (put_page_testzero(page)) {
-                homecache_change_page_home(page, order, initial_page_home());
+                homecache_change_page_home(page, order, PAGE_HOME_HASH);
                 if (order == 0) {
                         free_hot_cold_page(page, 0);
                 } else {