2004-01-11 Yoshinori K. Okuji <okuji@enbug.org>

* stage2/terminfo.c (ti_set_term): Use a pointer to struct
	terminfo instead to avoid GCC's bug, which inserts a reference
	to memcpy implicitly.
	(ti_get_term): Likewise.
	All callers are fixed.

	* stage2/terminfo.h (ti_set_term): Updated.
	(ti_get_term): Likewise.

	* stage2/shared.h (struct linux_kernel_header): New member,
	initrd_max_address. Defined in the boot protocol 2.03 or higher.

	* stage2/boot.c (load_initrd): If the boot protocol is greater
	than or equal to 2.03, use the field ``initrd_max_address''
	instead of LINUX_INITRD_MAX_ADDRESS.
This commit is contained in:
okuji committed 2004-01-11 09:38:04 +00:00
1 parent 36ccd040ac
commit 2269fa15f8
6 files changed
+39 -18

No files matched your search

+3 -3
View File
@@ -1,7 +1,7 @@
/* builtins.c - the GRUB builtin commands */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 1999,2000,2001,2002,2003 Free Software Foundation, Inc.
* Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -4208,12 +4208,12 @@ terminfo_func (char *arg, int flags)
return errnum;
}
ti_set_term (term);
ti_set_term (&term);
}
else
{
/* No option specifies printing out current settings. */
term = ti_get_term ();
ti_get_term (&term);
grub_printf ("name=%s\n",
ti_escape_string (term.name));