From fd63d02ceb636310d0d7912d67f3983b52236e49 Mon Sep 17 00:00:00 2001
From: Brian Gerst <brgerst@gmail.com>
Date: Fri, 3 Sep 2010 21:17:08 -0400
Subject: [PATCH] --- yaml --- r: 212034 b: refs/heads/master c:
 2df7a6e9e8e67c19e5fe2eac3f2d2223b7bb4a7b h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86/include/asm/processor.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8d7d585c2152..dae26108d047 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f999ab5a1360afc388868cc0ef9afe8edeef3be
+refs/heads/master: 2df7a6e9e8e67c19e5fe2eac3f2d2223b7bb4a7b
diff --git a/trunk/arch/x86/include/asm/processor.h b/trunk/arch/x86/include/asm/processor.h
index 325b7bdbebaa..396b80f2d871 100644
--- a/trunk/arch/x86/include/asm/processor.h
+++ b/trunk/arch/x86/include/asm/processor.h
@@ -602,7 +602,7 @@ extern unsigned long		mmu_cr4_features;
 
 static inline void set_in_cr4(unsigned long mask)
 {
-	unsigned cr4;
+	unsigned long cr4;
 
 	mmu_cr4_features |= mask;
 	cr4 = read_cr4();
@@ -612,7 +612,7 @@ static inline void set_in_cr4(unsigned long mask)
 
 static inline void clear_in_cr4(unsigned long mask)
 {
-	unsigned cr4;
+	unsigned long cr4;
 
 	mmu_cr4_features &= ~mask;
 	cr4 = read_cr4();