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

* grub-core/lib/relocator.c (grub_relocator_subchunk): Remove now

Browse source 
useless field head. All users updated.
	(free_subchunk): Correct handling of IN_REGION subchunk.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-10-22 22:49:36 +02:00
parent 0cbcdf0e6f
commit e138c45836
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2010-10-22 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/lib/relocator.c (grub_relocator_subchunk): Remove now
useless field head. All users updated.
(free_subchunk): Correct handling of IN_REGION subchunk.
2010-10-22 Colin Watson <cjwatson@ubuntu.com> 2010-10-22 Colin Watson <cjwatson@ubuntu.com>
* docs/grub.texi (Installing GRUB using grub-install): Proofread. * docs/grub.texi (Installing GRUB using grub-install): Proofread.

6
grub-core/lib/relocator.c
View file

@ -40,7 +40,6 @@ struct grub_relocator_subchunk
#endif #endif
} type; } type;
grub_mm_region_t reg; grub_mm_region_t reg;
grub_mm_header_t head;
grub_phys_addr_t start; grub_phys_addr_t start;
grub_size_t size; grub_size_t size;
grub_size_t pre_size; grub_size_t pre_size;
@ -355,11 +354,11 @@ free_subchunk (const struct grub_relocator_subchunk *subchu)
} }
case CHUNK_TYPE_IN_REGION: case CHUNK_TYPE_IN_REGION:
{ {
grub_mm_header_t h = (grub_mm_header_t) ALIGN_DOWN ((grub_addr_t) subchu->head, grub_mm_header_t h = (grub_mm_header_t) ALIGN_DOWN ((grub_addr_t) subchu->start,
GRUB_MM_ALIGN); GRUB_MM_ALIGN);
h->size h->size
= ((subchu->start + subchu->size + GRUB_MM_ALIGN - 1) / GRUB_MM_ALIGN) = ((subchu->start + subchu->size + GRUB_MM_ALIGN - 1) / GRUB_MM_ALIGN)
- (subchu->start / GRUB_MM_ALIGN); - (subchu->start / GRUB_MM_ALIGN) - 1;
h->next = h; h->next = h;
h->magic = GRUB_MM_ALLOC_MAGIC; h->magic = GRUB_MM_ALLOC_MAGIC;
grub_free (h + 1); grub_free (h + 1);
@ -971,7 +970,6 @@ malloc_in_range (struct grub_relocator *rel,
|| typepre == CHUNK_TYPE_IN_REGION) || typepre == CHUNK_TYPE_IN_REGION)
{ {
curschu->reg = events[last_start].reg; curschu->reg = events[last_start].reg;
curschu->head = events[last_start].head;
curschu->pre_size = alloc_start - events[j - 1].pos; curschu->pre_size = alloc_start - events[j - 1].pos;
} }
if (!oom && (typepre == CHUNK_TYPE_REGION_START if (!oom && (typepre == CHUNK_TYPE_REGION_START