From 70af9215549a5788f4be0e89a668d0406c3ba69d Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Thu, 20 Sep 2012 22:08:28 +0000
Subject: [PATCH] --- yaml --- r: 330379 b: refs/heads/master c:
 8e166991c0c3631b8af5a26990df77fa2a1d09e6 h: refs/heads/master i:   330377:
 0f273bb6f8109a0af7e04f91b62cc657bb74e30c   330375:
 b38245e326fc5e41865b9d1e3d81b30339d557b0 v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/powerpc/mm/hash_native_64.c | 26 +-------------------------
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/[refs] b/[refs]
index 537f9eaa7911..e7ae8894b266 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 466921c5a4669f4315528a25f9afd66601ce2c04
+refs/heads/master: 8e166991c0c3631b8af5a26990df77fa2a1d09e6
diff --git a/trunk/arch/powerpc/mm/hash_native_64.c b/trunk/arch/powerpc/mm/hash_native_64.c
index a4a1c728f269..ffc1e00f7a22 100644
--- a/trunk/arch/powerpc/mm/hash_native_64.c
+++ b/trunk/arch/powerpc/mm/hash_native_64.c
@@ -569,29 +569,6 @@ static void native_flush_hash_range(unsigned long number, int local)
 	local_irq_restore(flags);
 }
 
-#ifdef CONFIG_PPC_PSERIES
-/* Disable TLB batching on nighthawk */
-static inline int tlb_batching_enabled(void)
-{
-	struct device_node *root = of_find_node_by_path("/");
-	int enabled = 1;
-
-	if (root) {
-		const char *model = of_get_property(root, "model", NULL);
-		if (model && !strcmp(model, "IBM,9076-N81"))
-			enabled = 0;
-		of_node_put(root);
-	}
-
-	return enabled;
-}
-#else
-static inline int tlb_batching_enabled(void)
-{
-	return 1;
-}
-#endif
-
 void __init hpte_init_native(void)
 {
 	ppc_md.hpte_invalidate	= native_hpte_invalidate;
@@ -600,6 +577,5 @@ void __init hpte_init_native(void)
 	ppc_md.hpte_insert	= native_hpte_insert;
 	ppc_md.hpte_remove	= native_hpte_remove;
 	ppc_md.hpte_clear_all	= native_hpte_clear;
-	if (tlb_batching_enabled())
-		ppc_md.flush_hash_range = native_flush_hash_range;
+	ppc_md.flush_hash_range = native_flush_hash_range;
 }