2008-01-21 Robert Millan <rmh@aybabtu.com>
* include/grub/i386/pc/kernel.h: Include `<grub/symbol.h>'. * include/grub/kernel.h (grub_arch_memdisk_addr, grub_arch_memdisk_size): Moved from here ... * include/grub/i386/pc/kernel.h (grub_arch_memdisk_addr, grub_arch_memdisk_size): ... to here.
This commit is contained in:
parent
6c391b218e
commit
ffd36e34b3
3 changed files with 14 additions and 2 deletions
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
||||||
|
2008-01-21 Robert Millan <rmh@aybabtu.com>
|
||||||
|
|
||||||
|
* include/grub/i386/pc/kernel.h: Include `<grub/symbol.h>'.
|
||||||
|
|
||||||
|
* include/grub/kernel.h (grub_arch_memdisk_addr,
|
||||||
|
grub_arch_memdisk_size): Moved from here ...
|
||||||
|
|
||||||
|
* include/grub/i386/pc/kernel.h (grub_arch_memdisk_addr,
|
||||||
|
grub_arch_memdisk_size): ... to here.
|
||||||
|
|
||||||
2008-01-21 Robert Millan <rmh@aybabtu.com>
|
2008-01-21 Robert Millan <rmh@aybabtu.com>
|
||||||
|
|
||||||
Mostly based on bugfix from Bean.
|
Mostly based on bugfix from Bean.
|
||||||
|
|
|
@ -48,6 +48,7 @@
|
||||||
|
|
||||||
#ifndef ASM_FILE
|
#ifndef ASM_FILE
|
||||||
|
|
||||||
|
#include <grub/symbol.h>
|
||||||
#include <grub/types.h>
|
#include <grub/types.h>
|
||||||
|
|
||||||
/* The size of kernel image. */
|
/* The size of kernel image. */
|
||||||
|
@ -75,6 +76,9 @@ extern grub_int32_t grub_boot_drive;
|
||||||
/* The end address of the kernel. */
|
/* The end address of the kernel. */
|
||||||
extern grub_addr_t grub_end_addr;
|
extern grub_addr_t grub_end_addr;
|
||||||
|
|
||||||
|
extern grub_addr_t EXPORT_FUNC(grub_arch_memdisk_addr) (void);
|
||||||
|
extern grub_off_t EXPORT_FUNC(grub_arch_memdisk_size) (void);
|
||||||
|
|
||||||
#endif /* ! ASM_FILE */
|
#endif /* ! ASM_FILE */
|
||||||
|
|
||||||
#endif /* ! KERNEL_MACHINE_HEADER */
|
#endif /* ! KERNEL_MACHINE_HEADER */
|
||||||
|
|
|
@ -45,8 +45,6 @@ struct grub_module_info
|
||||||
};
|
};
|
||||||
|
|
||||||
extern grub_addr_t grub_arch_modules_addr (void);
|
extern grub_addr_t grub_arch_modules_addr (void);
|
||||||
extern grub_addr_t EXPORT_FUNC(grub_arch_memdisk_addr) (void);
|
|
||||||
extern grub_off_t EXPORT_FUNC(grub_arch_memdisk_size) (void);
|
|
||||||
|
|
||||||
/* The start point of the C code. */
|
/* The start point of the C code. */
|
||||||
void grub_main (void);
|
void grub_main (void);
|
||||||
|
|
Loading…
Reference in a new issue