Skip to content

Commit

Permalink
x86: move some function out of setup_bootmem_alloc
Browse files Browse the repository at this point in the history
... to make it more like 64-bit.

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Yinghai Lu authored and Ingo Molnar committed Jul 8, 2008
1 parent 064d25f commit 593a0cc
Showing 1 changed file with 16 additions and 15 deletions.
31 changes: 16 additions & 15 deletions arch/x86/kernel/setup_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -623,21 +623,6 @@ void __init setup_bootmem_allocator(void)
free_bootmem_with_active_regions(i, max_low_pfn);
early_res_to_bootmem(0, max_low_pfn<<PAGE_SHIFT);

#ifdef CONFIG_ACPI_SLEEP
/*
* Reserve low memory region for sleep support.
*/
acpi_reserve_bootmem();
#endif
#ifdef CONFIG_X86_FIND_SMP_CONFIG
/*
* Find and reserve possible boot-time SMP configuration:
*/
find_smp_config();
#endif
reserve_crashkernel();

reserve_ibft_region();
}

/*
Expand Down Expand Up @@ -792,6 +777,22 @@ void __init setup_arch(char **cmdline_p)

max_low_pfn = setup_memory();

#ifdef CONFIG_ACPI_SLEEP
/*
* Reserve low memory region for sleep support.
*/
acpi_reserve_bootmem();
#endif
#ifdef CONFIG_X86_FIND_SMP_CONFIG
/*
* Find and reserve possible boot-time SMP configuration:
*/
find_smp_config();
#endif
reserve_crashkernel();

reserve_ibft_region();

#ifdef CONFIG_KVM_CLOCK
kvmclock_init();
#endif
Expand Down

0 comments on commit 593a0cc

Please sign in to comment.