diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
| commit | 330f28f691e9b349e34adcaf82b273cf061bb491 (patch) | |
| tree | fca3bfe41eff25ef19f576cef1979c68f6521af5 /arch/x86/kernel/e820.c | |
| parent | fe3e78e073d25308756f38019956061153267769 (diff) | |
| parent | 6fc786d5034ed7ce2d43c459211137de6d99dd28 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'arch/x86/kernel/e820.c')
| -rw-r--r-- | arch/x86/kernel/e820.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index 85419bb7d4ab..d17d482a04f4 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c | |||
| @@ -1378,8 +1378,8 @@ static unsigned long ram_alignment(resource_size_t pos) | |||
| 1378 | if (mb < 16) | 1378 | if (mb < 16) |
| 1379 | return 1024*1024; | 1379 | return 1024*1024; |
| 1380 | 1380 | ||
| 1381 | /* To 32MB for anything above that */ | 1381 | /* To 64MB for anything above that */ |
| 1382 | return 32*1024*1024; | 1382 | return 64*1024*1024; |
| 1383 | } | 1383 | } |
| 1384 | 1384 | ||
| 1385 | #define MAX_RESOURCE_SIZE ((resource_size_t)-1) | 1385 | #define MAX_RESOURCE_SIZE ((resource_size_t)-1) |