From 6383ae8db4e6e2b337d1e61b43f964e9fbeee335 Mon Sep 17 00:00:00 2001
From: Borislav Petkov <borislav.petkov@amd.com>
Date: Tue, 19 Oct 2010 22:17:37 +0000
Subject: [PATCH] --- yaml --- r: 212068 b: refs/heads/master c:
 f01f7c56a1425b9749a99af821e1de334fb64d7e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d3d9f3058711..7da82a88861c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 617d34d9e5d8326ec8f188c616aa06ac59d083fe
+refs/heads/master: f01f7c56a1425b9749a99af821e1de334fb64d7e
diff --git a/trunk/arch/x86/mm/fault.c b/trunk/arch/x86/mm/fault.c
index 6c27c39f8a37..0cdb8d493f61 100644
--- a/trunk/arch/x86/mm/fault.c
+++ b/trunk/arch/x86/mm/fault.c
@@ -230,7 +230,7 @@ void vmalloc_sync_all(void)
 		spin_lock_irqsave(&pgd_lock, flags);
 		list_for_each_entry(page, &pgd_list, lru) {
 			spinlock_t *pgt_lock;
-			int ret;
+			pmd_t *ret;
 
 			pgt_lock = &pgd_page_get_mm(page)->page_table_lock;