diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-25 07:51:46 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-25 07:51:46 -0500 |
| commit | 0b271ef4521756010675b1611bef20fd3096790d (patch) | |
| tree | 2c9d22a2c74122a9904e533df27f41d63ffef394 /arch/mn10300/kernel/setup.c | |
| parent | b19b3c74c7bbec45a848631b8f970ac110665a01 (diff) | |
| parent | 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff) | |
Merge commit 'v2.6.28' into core/core
Diffstat (limited to 'arch/mn10300/kernel/setup.c')
| -rw-r--r-- | arch/mn10300/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mn10300/kernel/setup.c b/arch/mn10300/kernel/setup.c index 017121ce896f..e1d88ab51008 100644 --- a/arch/mn10300/kernel/setup.c +++ b/arch/mn10300/kernel/setup.c | |||
| @@ -161,7 +161,7 @@ void __init setup_arch(char **cmdline_p) | |||
| 161 | reserve the page it is occupying. */ | 161 | reserve the page it is occupying. */ |
| 162 | if (CONFIG_INTERRUPT_VECTOR_BASE >= CONFIG_KERNEL_RAM_BASE_ADDRESS && | 162 | if (CONFIG_INTERRUPT_VECTOR_BASE >= CONFIG_KERNEL_RAM_BASE_ADDRESS && |
| 163 | CONFIG_INTERRUPT_VECTOR_BASE < memory_end) | 163 | CONFIG_INTERRUPT_VECTOR_BASE < memory_end) |
| 164 | reserve_bootmem(CONFIG_INTERRUPT_VECTOR_BASE, 1, | 164 | reserve_bootmem(CONFIG_INTERRUPT_VECTOR_BASE, PAGE_SIZE, |
| 165 | BOOTMEM_DEFAULT); | 165 | BOOTMEM_DEFAULT); |
| 166 | 166 | ||
| 167 | reserve_bootmem(PAGE_ALIGN(PFN_PHYS(free_pfn)), bootmap_size, | 167 | reserve_bootmem(PAGE_ALIGN(PFN_PHYS(free_pfn)), bootmap_size, |