diff options
| author | Brian Gerst <brgerst@gmail.com> | 2010-09-03 21:17:08 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-09-09 14:16:13 -0700 |
| commit | 2df7a6e9e8e67c19e5fe2eac3f2d2223b7bb4a7b (patch) | |
| tree | c1e16dd8ba18060ee22705acb390371a40a13cfa /arch/x86/include | |
| parent | 1f999ab5a1360afc388868cc0ef9afe8edeef3be (diff) | |
| download | blackbird-op-linux-2df7a6e9e8e67c19e5fe2eac3f2d2223b7bb4a7b.tar.gz blackbird-op-linux-2df7a6e9e8e67c19e5fe2eac3f2d2223b7bb4a7b.zip | |
x86: Use correct type for %cr4
%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>
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/processor.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index 325b7bdbebaa..396b80f2d871 100644 --- a/arch/x86/include/asm/processor.h +++ b/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(); |
