]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
x86: Use correct type for %cr4
authorBrian Gerst <brgerst@gmail.com>
Sat, 4 Sep 2010 01:17:08 +0000 (21:17 -0400)
committerH. Peter Anvin <hpa@linux.intel.com>
Thu, 9 Sep 2010 21:16:13 +0000 (14:16 -0700)
%cr4 is 64-bit in 64-bit mode (although the upper 32-bits are currently reserved).
Use unsigned long for the temporary variable to get the right size.

Signed-off-by: Brian Gerst <brgerst@gmail.com>
Acked-by: Pekka Enberg <penberg@kernel.org>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
LKML-Reference: <1283563039-3466-2-git-send-email-brgerst@gmail.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
arch/x86/include/asm/processor.h

index 325b7bdbebaa9494b3e3e4c08a314aed72f88dc4..396b80f2d871b9f296b42bd2de81a2e345b8d06b 100644 (file)
@@ -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();