vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Prevent potential loss of memory map by overwrite on qemu-mips.

Browse source 
* grub-core/boot/mips/startup_raw.S [GRUB_MACHINE_MIPS_QEMU_MIPS]:
	Save ram size in $s4.
	* grub-core/kern/mips/qemu_mips/init.c (RAMSIZE): Removed.
	All users changed to grub_arch_memsize.
	* grub-core/kern/mips/startup.S (grub_arch_machine): Restrict to
	Loongson.
	[GRUB_MACHINE_MIPS_QEMU_MIPS]: Save grub_arch_memsize.
	* grub-core/loader/mips/linux.c (grub_linux_boot): Pass memory size.
	* include/grub/mips/qemu_mips/memory.h (grub_arch_memsize): New
	external variable.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-05-17 19:32:51 +02:00
parent 5d420cd983
commit 566a191715
6 changed files with 44 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
grub-core/kern/mips/qemu_mips/init.c
View file

@ -10,8 +10,6 @@
#include <grub/cpu/memory.h>
#include <grub/memory.h>
#define RAMSIZE (*(grub_uint32_t *) ((16 << 20) - 264))
extern void grub_serial_init (void);
extern void grub_terminfo_init (void);
@ -24,7 +22,7 @@ grub_machine_init (void)
grub_arch_cpuclock = 64000000;
modend = grub_modules_get_end ();
grub_mm_init_region ((void *) modend, RAMSIZE
grub_mm_init_region ((void *) modend, grub_arch_memsize
- (modend - GRUB_ARCH_LOWMEMVSTART));
grub_install_get_time_ms (grub_rtc_get_time_ms);
@ -59,6 +57,6 @@ grub_reboot (void)
grub_err_t
grub_machine_mmap_iterate (grub_memory_hook_t hook)
{
hook (0, RAMSIZE, GRUB_MEMORY_AVAILABLE);
hook (0, grub_arch_memsize, GRUB_MEMORY_AVAILABLE);
return GRUB_ERR_NONE;
}