Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5368a2be authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

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: default avatarH. Peter Anvin <hpa@zytor.com>
Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
parent 93dbda7c

arch/x86/kernel/setup.c

+29 −28
Original line number Original line Diff line number Diff line
@@ -272,6 +272,35 @@ static inline void copy_edd(void) 
}

}

#endif

#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_BLK_DEV_INITRD





#ifdef CONFIG_X86_32

#ifdef CONFIG_X86_32
@@ -340,34 +369,6 @@ static void __init relocate_initrd(void) 
}

}

#endif

#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)

static void __init reserve_initrd(void)

{

{

	u64 ramdisk_image = boot_params.hdr.ramdisk_image;

	u64 ramdisk_image = boot_params.hdr.ramdisk_image;