diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-09-27 00:30:07 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-27 18:09:33 +0200 |
| commit | 7fc2368d1d0dce7a778beb2fba3acac8fa7a34b6 (patch) | |
| tree | 142fa4095d39f7167a824bd01e043ebef97fb016 /arch/x86/kernel/cpu/mtrr | |
| parent | 6ef190cc92e33565accff6a320f0e7d90480bfe7 (diff) | |
| download | kernel_samsung_smdk4412-7fc2368d1d0dce7a778beb2fba3acac8fa7a34b6.zip kernel_samsung_smdk4412-7fc2368d1d0dce7a778beb2fba3acac8fa7a34b6.tar.gz kernel_samsung_smdk4412-7fc2368d1d0dce7a778beb2fba3acac8fa7a34b6.tar.bz2 | |
x86: don't need to go to chunksize to 4G
change back chunksize max to 2g
otherwise will get strange layout in 2G ram system like
0 - 4g WB, 2040M - 2048M UC, 2048M - 4G NC
instead of
0 - 2g WB, 2040M - 2048M UC
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpu/mtrr')
| -rw-r--r-- | arch/x86/kernel/cpu/mtrr/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c index b117d7f..cc13557 100644 --- a/arch/x86/kernel/cpu/mtrr/main.c +++ b/arch/x86/kernel/cpu/mtrr/main.c @@ -1155,10 +1155,10 @@ struct mtrr_cleanup_result { /* * gran_size: 1M, 2M, ..., 2G - * chunk size: gran_size, ..., 4G - * so we need (2+13)*6 + * chunk size: gran_size, ..., 2G + * so we need (1+12)*6 */ -#define NUM_RESULT 90 +#define NUM_RESULT 78 #define PSHIFT (PAGE_SHIFT - 10) static struct mtrr_cleanup_result __initdata result[NUM_RESULT]; @@ -1276,7 +1276,7 @@ static int __init mtrr_cleanup(unsigned address_bits) memset(min_loss_pfn, 0xff, sizeof(min_loss_pfn)); memset(result, 0, sizeof(result)); for (gran_size = (1ULL<<20); gran_size < (1ULL<<32); gran_size <<= 1) { - for (chunk_size = gran_size; chunk_size < (1ULL<<33); + for (chunk_size = gran_size; chunk_size < (1ULL<<32); chunk_size <<= 1) { int num_reg; |