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

merge mainline into nestpart

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-02-06 18:47:17 +01:00
commit bc6fcf0931
62 changed files with 7634 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kern/disk.c
View file

@ -449,7 +449,7 @@ grub_disk_read (grub_disk_t disk, grub_disk_addr_t sector,
grub_errno = GRUB_ERR_NONE;
num = ((size + real_offset + pos + GRUB_DISK_SECTOR_SIZE - 1)
num = ((size + real_offset + GRUB_DISK_SECTOR_SIZE - 1)
>> GRUB_DISK_SECTOR_BITS);
p = grub_realloc (tmp_buf, num << GRUB_DISK_SECTOR_BITS);
@ -466,7 +466,7 @@ grub_disk_read (grub_disk_t disk, grub_disk_addr_t sector,
goto finish;
}
grub_memcpy (buf, tmp_buf + pos + real_offset, size);
grub_memcpy (buf, tmp_buf + real_offset, size);
/* Call the read hook, if any. */
if (disk->read_hook)