Commit-ID: 5368a2be34b96fda9c05d79424fa63a73ead04ed
Gitweb: http://git.kernel.org/tip/5368a2be34b96fda9c05d79424fa63a73ead04ed
Author: H. Peter Anvin <hpa@xxxxxxxxx>
AuthorDate: Sat, 14 Mar 2009 17:19:51 -0700
Commit: H. Peter Anvin <hpa@xxxxxxxxx>
CommitDate: Sat, 14 Mar 2009 17:23:41 -0700
x86: move brk initialization out of #ifdef CONFIG_BLK_DEV_INITRD
Impact: build fix
The brk initialization functions were incorrectly located inside
an #ifdef CONFIG_VLK_DEV_INITRD block, causing the obvious build failure in
minimal configurations.
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
---
arch/x86/kernel/setup.c | 57 ++++++++++++++++++++++++-----------------------
1 files changed, 29 insertions(+), 28 deletions(-)
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index e6b742d..b832902 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -272,6 +272,35 @@ static inline void copy_edd(void)
}
#endif
+void * __init extend_brk(size_t size, size_t align)
+{
+ size_t mask = align - 1;
+ void *ret;
+
+ BUG_ON(_brk_start == 0);
+ BUG_ON(align & mask);
+
+ _brk_end = (_brk_end + mask) & ~mask;
+ BUG_ON((char *)(_brk_end + size) > __brk_limit);
+
+ ret = (void *)_brk_end;
+ _brk_end += size;
+
+ memset(ret, 0, size);
+
+ return ret;
+}
+
+static void __init reserve_brk(void)
+{
+ if (_brk_end > _brk_start)
+ reserve_early(__pa(_brk_start), __pa(_brk_end), "BRK");
+
+ /* Mark brk area as locked down and no longer taking any
+ new allocations */
+ _brk_start = 0;
+}
+
#ifdef CONFIG_BLK_DEV_INITRD
#ifdef CONFIG_X86_32
@@ -340,34 +369,6 @@ static void __init relocate_initrd(void)
}
#endif
-void * __init extend_brk(size_t size, size_t align)
-{
- size_t mask = align - 1;
- void *ret;
-
- BUG_ON(_brk_start == 0);
- BUG_ON(align & mask);
-
- _brk_end = (_brk_end + mask) & ~mask;
- BUG_ON((char *)(_brk_end + size) > __brk_limit);
-
- ret = (void *)_brk_end;
- _brk_end += size;
-
- memset(ret, 0, size);
-
- return ret;
-}
-
-static void __init reserve_brk(void)
-{
- if (_brk_end > _brk_start)
- reserve_early(__pa(_brk_start), __pa(_brk_end), "BRK");
-
- /* Mark brk area as locked down and no longer taking any new allocations */
- _brk_start = 0;
-}
-
static void __init reserve_initrd(void)
{
u64 ramdisk_image = boot_params.hdr.ramdisk_image;
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|