merge mainline into luks

This commit is contained in:
Vladimir 'phcoder' Serbinenko committed 2011-04-25 17:04:27 +02:00
commit 8c767fd198
30 files changed
+143 -18

No files matched your search

+3 -2
View File
@@ -114,8 +114,9 @@ amiga_partition_map_iterate (grub_disk_t disk,
return grub_errno;
if (grub_memcmp (apart.magic, GRUB_AMIGA_PART_MAGIC,
sizeof (apart.magic)) == 0)
sizeof (apart.magic)) != 0)
return grub_error (GRUB_ERR_BAD_PART_TABLE,
"invalid Amiga partition map");
/* Calculate the first block and the size of the partition. */
part.start = (grub_be_to_cpu32 (apart.lowcyl)
* grub_be_to_cpu32 (apart.heads)