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

* grub-core/loader/i386/linux.c (allocate_pages): Fix spelling of

Browse source 
preferred_address.
(grub_cmd_linux): Likewise.
* grub-core/net/icmp6.c (struct prefix_option): Fix spelling of
preferred_lifetime.  Update all users.
This commit is contained in:
Colin Watson 2012-10-05 13:09:19 +01:00
parent 288c757d70
commit 39525c22be
3 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2012-10-05 Colin Watson <cjwatson@debian.org>
* grub-core/loader/i386/linux.c (allocate_pages): Fix spelling of
preferred_address.
(grub_cmd_linux): Likewise.
* grub-core/net/icmp6.c (struct prefix_option): Fix spelling of
preferred_lifetime. Update all users.
2012-09-26 Colin Watson <cjwatson@ubuntu.com> 2012-09-26 Colin Watson <cjwatson@ubuntu.com>
* Makefile.util.def (grub-mknetdir): Move to $prefix/bin. * Makefile.util.def (grub-mknetdir): Move to $prefix/bin.

18
grub-core/loader/i386/linux.c
View file

@ -191,7 +191,7 @@ free_pages (void)
static grub_err_t static grub_err_t
allocate_pages (grub_size_t prot_size, grub_size_t *align, allocate_pages (grub_size_t prot_size, grub_size_t *align,
grub_size_t min_align, int relocatable, grub_size_t min_align, int relocatable,
grub_uint64_t prefered_address) grub_uint64_t preferred_address)
{ {
grub_err_t err; grub_err_t err;
@ -215,8 +215,8 @@ allocate_pages (grub_size_t prot_size, grub_size_t *align,
if (relocatable) if (relocatable)
{ {
err = grub_relocator_alloc_chunk_align (relocator, &ch, err = grub_relocator_alloc_chunk_align (relocator, &ch,
prefered_address, preferred_address,
prefered_address, preferred_address,
prot_size, 1, prot_size, 1,
GRUB_RELOCATOR_PREFERENCE_LOW, GRUB_RELOCATOR_PREFERENCE_LOW,
1); 1);
@ -235,7 +235,7 @@ allocate_pages (grub_size_t prot_size, grub_size_t *align,
} }
else else
err = grub_relocator_alloc_chunk_addr (relocator, &ch, err = grub_relocator_alloc_chunk_addr (relocator, &ch,
prefered_address, preferred_address,
prot_size); prot_size);
if (err) if (err)
goto fail; goto fail;
@ -680,7 +680,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
int i; int i;
grub_size_t align, min_align; grub_size_t align, min_align;
int relocatable; int relocatable;
grub_uint64_t preffered_address = GRUB_LINUX_BZIMAGE_ADDR; grub_uint64_t preferred_address = GRUB_LINUX_BZIMAGE_ADDR;
grub_dl_ref (my_mod); grub_dl_ref (my_mod);
@ -775,22 +775,22 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
prot_size = grub_le_to_cpu32 (lh.init_size); prot_size = grub_le_to_cpu32 (lh.init_size);
prot_init_space = page_align (prot_size); prot_init_space = page_align (prot_size);
if (relocatable) if (relocatable)
preffered_address = grub_le_to_cpu64 (lh.pref_address); preferred_address = grub_le_to_cpu64 (lh.pref_address);
else else
preffered_address = GRUB_LINUX_BZIMAGE_ADDR; preferred_address = GRUB_LINUX_BZIMAGE_ADDR;
} }
else else
{ {
min_align = align; min_align = align;
prot_size = prot_file_size; prot_size = prot_file_size;
preffered_address = GRUB_LINUX_BZIMAGE_ADDR; preferred_address = GRUB_LINUX_BZIMAGE_ADDR;
/* Usually, the compression ratio is about 50%. */ /* Usually, the compression ratio is about 50%. */
prot_init_space = page_align (prot_size) * 3; prot_init_space = page_align (prot_size) * 3;
} }
if (allocate_pages (prot_size, &align, if (allocate_pages (prot_size, &align,
min_align, relocatable, min_align, relocatable,
preffered_address)) preferred_address))
goto fail; goto fail;
params = (struct linux_kernel_params *) &linux_params; params = (struct linux_kernel_params *) &linux_params;

6
grub-core/net/icmp6.c
View file

@ -55,7 +55,7 @@ struct prefix_option
grub_uint8_t prefixlen; grub_uint8_t prefixlen;
grub_uint8_t flags; grub_uint8_t flags;
grub_uint32_t valid_lifetime; grub_uint32_t valid_lifetime;
grub_uint32_t prefered_lifetime; grub_uint32_t preferred_lifetime;
grub_uint32_t reserved; grub_uint32_t reserved;
grub_uint64_t prefix[2]; grub_uint64_t prefix[2];
} __attribute__ ((packed)); } __attribute__ ((packed));
@ -370,14 +370,14 @@ grub_net_recv_icmp6_packet (struct grub_net_buff *nb,
struct grub_net_slaac_mac_list *slaac; struct grub_net_slaac_mac_list *slaac;
if (!(opt->flags & FLAG_SLAAC) if (!(opt->flags & FLAG_SLAAC)
|| (grub_be_to_cpu64 (opt->prefix[0]) >> 48) == 0xfe80 || (grub_be_to_cpu64 (opt->prefix[0]) >> 48) == 0xfe80
|| (grub_be_to_cpu32 (opt->prefered_lifetime) || (grub_be_to_cpu32 (opt->preferred_lifetime)
> grub_be_to_cpu32 (opt->valid_lifetime)) > grub_be_to_cpu32 (opt->valid_lifetime))
|| opt->prefixlen != 64) || opt->prefixlen != 64)
{ {
grub_dprintf ("net", "discarded prefix: %d, %d, %d, %d\n", grub_dprintf ("net", "discarded prefix: %d, %d, %d, %d\n",
!(opt->flags & FLAG_SLAAC), !(opt->flags & FLAG_SLAAC),
(grub_be_to_cpu64 (opt->prefix[0]) >> 48) == 0xfe80, (grub_be_to_cpu64 (opt->prefix[0]) >> 48) == 0xfe80,
(grub_be_to_cpu32 (opt->prefered_lifetime) (grub_be_to_cpu32 (opt->preferred_lifetime)
> grub_be_to_cpu32 (opt->valid_lifetime)), > grub_be_to_cpu32 (opt->valid_lifetime)),
opt->prefixlen != 64); opt->prefixlen != 64);
continue; continue;