---

yaml --- r: 83694 b: refs/heads/master c: 2d684cd h: refs/heads/master v: v3
git-mirror · Feb 6, 2008 · 8d585ac · 8d585ac
1 parent 3fee555
commit 8d585ac
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8b57bb700a73872fd06b891d7c9bc4cea1a6af4
+refs/heads/master: 2d684cd6d9cf0c6a0e28978362671b6e2d8fb56c
diff --git a/trunk/arch/x86/mm/pageattr.c b/trunk/arch/x86/mm/pageattr.c
@@ -260,17 +260,6 @@ try_preserve_large_page(pte_t *kpte, unsigned long address,
 	pgprot_t old_prot, new_prot;
 	int level, do_split = 1;
 
-	/*
-	 * An Athlon 64 X2 showed hard hangs if we tried to preserve
-	 * largepages and changed the PSE entry from RW to RO.
-	 *
-	 * As AMD CPUs have a long series of erratas in this area,
-	 * (and none of the known ones seem to explain this hang),
-	 * disable this code until the hang can be debugged:
-	 */
-	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
-		return 1;
-
 	spin_lock_irqsave(&pgd_lock, flags);
 	/*
 	 * Check for races, another CPU might have split this page