|
 |
f96e0b |
From 8c38cb1283a0cf1c8eae465bff26e0ca966ac43a Mon Sep 17 00:00:00 2001
|
|
|
f96e0b |
From: Colin Watson <cjwatson@ubuntu.com>
|
|
|
f96e0b |
Date: Fri, 5 Oct 2012 13:09:19 +0100
|
|
|
f96e0b |
Subject: [PATCH 050/482] * grub-core/loader/i386/linux.c (allocate_pages): Fix
|
|
|
f96e0b |
spelling of preferred_address. (grub_cmd_linux): Likewise. *
|
|
|
f96e0b |
grub-core/net/icmp6.c (struct prefix_option): Fix spelling of
|
|
|
f96e0b |
preferred_lifetime. Update all users.
|
|
|
f96e0b |
|
|
|
f96e0b |
---
|
|
|
f96e0b |
ChangeLog | 8 ++++++++
|
|
|
f96e0b |
grub-core/loader/i386/linux.c | 18 +++++++++---------
|
|
|
f96e0b |
grub-core/net/icmp6.c | 6 +++---
|
|
|
f96e0b |
3 files changed, 20 insertions(+), 12 deletions(-)
|
|
|
f96e0b |
|
|
|
f96e0b |
diff --git a/ChangeLog b/ChangeLog
|
|
|
f96e0b |
index 2658573..d0aeab6 100644
|
|
|
f96e0b |
--- a/ChangeLog
|
|
|
f96e0b |
+++ b/ChangeLog
|
|
|
f96e0b |
@@ -1,3 +1,11 @@
|
|
|
f96e0b |
+2012-10-05 Colin Watson <cjwatson@debian.org>
|
|
|
f96e0b |
+
|
|
|
f96e0b |
+ * grub-core/loader/i386/linux.c (allocate_pages): Fix spelling of
|
|
|
f96e0b |
+ preferred_address.
|
|
|
f96e0b |
+ (grub_cmd_linux): Likewise.
|
|
|
f96e0b |
+ * grub-core/net/icmp6.c (struct prefix_option): Fix spelling of
|
|
|
f96e0b |
+ preferred_lifetime. Update all users.
|
|
|
f96e0b |
+
|
|
|
f96e0b |
2012-09-26 Colin Watson <cjwatson@ubuntu.com>
|
|
|
f96e0b |
|
|
|
f96e0b |
* Makefile.util.def (grub-mknetdir): Move to $prefix/bin.
|
|
|
f96e0b |
diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
|
|
|
f96e0b |
index bcb037c..fc0ebe7 100644
|
|
|
f96e0b |
--- a/grub-core/loader/i386/linux.c
|
|
|
f96e0b |
+++ b/grub-core/loader/i386/linux.c
|
|
|
f96e0b |
@@ -191,7 +191,7 @@ free_pages (void)
|
|
|
f96e0b |
static grub_err_t
|
|
|
f96e0b |
allocate_pages (grub_size_t prot_size, grub_size_t *align,
|
|
|
f96e0b |
grub_size_t min_align, int relocatable,
|
|
|
f96e0b |
- grub_uint64_t prefered_address)
|
|
|
f96e0b |
+ grub_uint64_t preferred_address)
|
|
|
f96e0b |
{
|
|
|
f96e0b |
grub_err_t err;
|
|
|
f96e0b |
|
|
|
f96e0b |
@@ -215,8 +215,8 @@ allocate_pages (grub_size_t prot_size, grub_size_t *align,
|
|
|
f96e0b |
if (relocatable)
|
|
|
f96e0b |
{
|
|
|
f96e0b |
err = grub_relocator_alloc_chunk_align (relocator, &ch,
|
|
|
f96e0b |
- prefered_address,
|
|
|
f96e0b |
- prefered_address,
|
|
|
f96e0b |
+ preferred_address,
|
|
|
f96e0b |
+ preferred_address,
|
|
|
f96e0b |
prot_size, 1,
|
|
|
f96e0b |
GRUB_RELOCATOR_PREFERENCE_LOW,
|
|
|
f96e0b |
1);
|
|
|
f96e0b |
@@ -235,7 +235,7 @@ allocate_pages (grub_size_t prot_size, grub_size_t *align,
|
|
|
f96e0b |
}
|
|
|
f96e0b |
else
|
|
|
f96e0b |
err = grub_relocator_alloc_chunk_addr (relocator, &ch,
|
|
|
f96e0b |
- prefered_address,
|
|
|
f96e0b |
+ preferred_address,
|
|
|
f96e0b |
prot_size);
|
|
|
f96e0b |
if (err)
|
|
|
f96e0b |
goto fail;
|
|
|
f96e0b |
@@ -680,7 +680,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|
|
f96e0b |
int i;
|
|
|
f96e0b |
grub_size_t align, min_align;
|
|
|
f96e0b |
int relocatable;
|
|
|
f96e0b |
- grub_uint64_t preffered_address = GRUB_LINUX_BZIMAGE_ADDR;
|
|
|
f96e0b |
+ grub_uint64_t preferred_address = GRUB_LINUX_BZIMAGE_ADDR;
|
|
|
f96e0b |
|
|
|
f96e0b |
grub_dl_ref (my_mod);
|
|
|
f96e0b |
|
|
|
f96e0b |
@@ -775,22 +775,22 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|
|
f96e0b |
prot_size = grub_le_to_cpu32 (lh.init_size);
|
|
|
f96e0b |
prot_init_space = page_align (prot_size);
|
|
|
f96e0b |
if (relocatable)
|
|
|
f96e0b |
- preffered_address = grub_le_to_cpu64 (lh.pref_address);
|
|
|
f96e0b |
+ preferred_address = grub_le_to_cpu64 (lh.pref_address);
|
|
|
f96e0b |
else
|
|
|
f96e0b |
- preffered_address = GRUB_LINUX_BZIMAGE_ADDR;
|
|
|
f96e0b |
+ preferred_address = GRUB_LINUX_BZIMAGE_ADDR;
|
|
|
f96e0b |
}
|
|
|
f96e0b |
else
|
|
|
f96e0b |
{
|
|
|
f96e0b |
min_align = align;
|
|
|
f96e0b |
prot_size = prot_file_size;
|
|
|
f96e0b |
- preffered_address = GRUB_LINUX_BZIMAGE_ADDR;
|
|
|
f96e0b |
+ preferred_address = GRUB_LINUX_BZIMAGE_ADDR;
|
|
|
f96e0b |
/* Usually, the compression ratio is about 50%. */
|
|
|
f96e0b |
prot_init_space = page_align (prot_size) * 3;
|
|
|
f96e0b |
}
|
|
|
f96e0b |
|
|
|
f96e0b |
if (allocate_pages (prot_size, &align,
|
|
|
f96e0b |
min_align, relocatable,
|
|
|
f96e0b |
- preffered_address))
|
|
|
f96e0b |
+ preferred_address))
|
|
|
f96e0b |
goto fail;
|
|
|
f96e0b |
|
|
|
f96e0b |
params = (struct linux_kernel_params *) &linux_params;
|
|
|
f96e0b |
diff --git a/grub-core/net/icmp6.c b/grub-core/net/icmp6.c
|
|
|
f96e0b |
index 4fc343d..9ded94b 100644
|
|
|
f96e0b |
--- a/grub-core/net/icmp6.c
|
|
|
f96e0b |
+++ b/grub-core/net/icmp6.c
|
|
|
f96e0b |
@@ -55,7 +55,7 @@ struct prefix_option
|
|
|
f96e0b |
grub_uint8_t prefixlen;
|
|
|
f96e0b |
grub_uint8_t flags;
|
|
|
f96e0b |
grub_uint32_t valid_lifetime;
|
|
|
f96e0b |
- grub_uint32_t prefered_lifetime;
|
|
|
f96e0b |
+ grub_uint32_t preferred_lifetime;
|
|
|
f96e0b |
grub_uint32_t reserved;
|
|
|
f96e0b |
grub_uint64_t prefix[2];
|
|
|
f96e0b |
} __attribute__ ((packed));
|
|
|
f96e0b |
@@ -370,14 +370,14 @@ grub_net_recv_icmp6_packet (struct grub_net_buff *nb,
|
|
|
f96e0b |
struct grub_net_slaac_mac_list *slaac;
|
|
|
f96e0b |
if (!(opt->flags & FLAG_SLAAC)
|
|
|
f96e0b |
|| (grub_be_to_cpu64 (opt->prefix[0]) >> 48) == 0xfe80
|
|
|
f96e0b |
- || (grub_be_to_cpu32 (opt->prefered_lifetime)
|
|
|
f96e0b |
+ || (grub_be_to_cpu32 (opt->preferred_lifetime)
|
|
|
f96e0b |
> grub_be_to_cpu32 (opt->valid_lifetime))
|
|
|
f96e0b |
|| opt->prefixlen != 64)
|
|
|
f96e0b |
{
|
|
|
f96e0b |
grub_dprintf ("net", "discarded prefix: %d, %d, %d, %d\n",
|
|
|
f96e0b |
!(opt->flags & FLAG_SLAAC),
|
|
|
f96e0b |
(grub_be_to_cpu64 (opt->prefix[0]) >> 48) == 0xfe80,
|
|
|
f96e0b |
- (grub_be_to_cpu32 (opt->prefered_lifetime)
|
|
|
f96e0b |
+ (grub_be_to_cpu32 (opt->preferred_lifetime)
|
|
|
f96e0b |
> grub_be_to_cpu32 (opt->valid_lifetime)),
|
|
|
f96e0b |
opt->prefixlen != 64);
|
|
|
f96e0b |
continue;
|
|
|
f96e0b |
--
|
|
|
f96e0b |
1.8.2.1
|
|
|
f96e0b |
|