diff options
author | Yinghai Lu <yinghai@kernel.org> | 2010-08-25 16:39:15 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2010-08-27 14:08:13 -0400 |
commit | f88eff74aa848e58b1ea49768c0bbb874b31357f (patch) | |
tree | a8fdf012b22f0cc3ea5eed6bbf5c5746db9a6a5a /mm | |
parent | fb74fb6db91abc3c1ceeb9d2c17b44866a12c63e (diff) |
bootmem, x86: Add weak version of reserve_bootmem_generic
It will be used memblock_x86_to_bootmem converting
It is an wrapper for reserve_bootmem, and x86 64bit is using special one.
Also clean up that version for x86_64. We don't need to take care of numa
path for that, bootmem can handle it how
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/bootmem.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mm/bootmem.c b/mm/bootmem.c index 142c84a54993..bde170dd2fde 100644 --- a/mm/bootmem.c +++ b/mm/bootmem.c | |||
@@ -526,6 +526,12 @@ int __init reserve_bootmem(unsigned long addr, unsigned long size, | |||
526 | } | 526 | } |
527 | 527 | ||
528 | #ifndef CONFIG_NO_BOOTMEM | 528 | #ifndef CONFIG_NO_BOOTMEM |
529 | int __weak __init reserve_bootmem_generic(unsigned long phys, unsigned long len, | ||
530 | int flags) | ||
531 | { | ||
532 | return reserve_bootmem(phys, len, flags); | ||
533 | } | ||
534 | |||
529 | static unsigned long __init align_idx(struct bootmem_data *bdata, | 535 | static unsigned long __init align_idx(struct bootmem_data *bdata, |
530 | unsigned long idx, unsigned long step) | 536 | unsigned long idx, unsigned long step) |
531 | { | 537 | { |