diff options
| author | zhenzhong.duan <zhenzhong.duan@oracle.com> | 2012-05-30 06:52:15 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-05-30 23:37:00 +0200 |
| commit | 2da06af8106f8f35318bb084baf8448797ef058a (patch) | |
| tree | 8bf4749904065ce3cecf56dcd9545340a61a926d /arch/x86 | |
| parent | Merge branch 'x86/trampoline' into x86/urgent (diff) | |
| download | linux-2da06af8106f8f35318bb084baf8448797ef058a.tar.xz linux-2da06af8106f8f35318bb084baf8448797ef058a.zip | |
x86, mtrr: Fix a type overflow in range_to_mtrr func
When boot on sun G5+ with 4T mem, see an overflow in mtrr cleanup as below.
*BAD*gran_size: 2G chunk_size: 2G num_reg: 10 lose cover RAM:
-18014398505283592M
This is because 1<<31 sign extended. Use an unsigned long constant to
fix it. Useful for mem larger than or equal to 4T.
-v2: Use 64bit constant instead of explicit type conversion as suggested
by Yinghai. Description updated too.
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@oracle.com>
Link: http://lkml.kernel.org/r/4FC5A77F.6060505@oracle.com
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/cpu/mtrr/cleanup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mtrr/cleanup.c b/arch/x86/kernel/cpu/mtrr/cleanup.c index ac140c7be396..bdda2e6c673b 100644 --- a/arch/x86/kernel/cpu/mtrr/cleanup.c +++ b/arch/x86/kernel/cpu/mtrr/cleanup.c @@ -266,7 +266,7 @@ range_to_mtrr(unsigned int reg, unsigned long range_startk, if (align > max_align) align = max_align; - sizek = 1 << align; + sizek = 1UL << align; if (debug_print) { char start_factor = 'K', size_factor = 'K'; unsigned long start_base, size_base; |