2020-07-29 20:47:36 +08:00
|
|
|
From d274cc00ea92dc4aa9c7b4b63e230e37186d31c6 Mon Sep 17 00:00:00 2001
|
2019-09-30 10:52:04 -04:00
|
|
|
From: Peter Jones <pjones@redhat.com>
|
|
|
|
|
Date: Thu, 10 May 2018 13:40:19 -0400
|
2020-07-29 20:47:36 +08:00
|
|
|
Subject: [PATCH 106/220] Fixup for newer compiler
|
2019-09-30 10:52:04 -04:00
|
|
|
|
|
|
|
|
---
|
|
|
|
|
grub-core/fs/btrfs.c | 2 +-
|
|
|
|
|
include/grub/gpt_partition.h | 2 +-
|
|
|
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
|
2020-07-29 20:47:36 +08:00
|
|
|
index ba99d04..9cd7f4b 100644
|
2019-09-30 10:52:04 -04:00
|
|
|
--- a/grub-core/fs/btrfs.c
|
|
|
|
|
+++ b/grub-core/fs/btrfs.c
|
2020-07-29 20:47:36 +08:00
|
|
|
@@ -215,7 +215,7 @@ struct grub_btrfs_inode
|
2019-09-30 10:52:04 -04:00
|
|
|
grub_uint64_t size;
|
|
|
|
|
grub_uint8_t dummy2[0x70];
|
|
|
|
|
struct grub_btrfs_time mtime;
|
|
|
|
|
-} GRUB_PACKED;
|
|
|
|
|
+} GRUB_PACKED __attribute__ ((aligned(8)));
|
|
|
|
|
|
|
|
|
|
struct grub_btrfs_extent_data
|
|
|
|
|
{
|
|
|
|
|
diff --git a/include/grub/gpt_partition.h b/include/grub/gpt_partition.h
|
2020-07-29 20:47:36 +08:00
|
|
|
index 7a93f43..8212697 100644
|
2019-09-30 10:52:04 -04:00
|
|
|
--- a/include/grub/gpt_partition.h
|
|
|
|
|
+++ b/include/grub/gpt_partition.h
|
|
|
|
|
@@ -76,7 +76,7 @@ struct grub_gpt_partentry
|
|
|
|
|
grub_uint64_t end;
|
|
|
|
|
grub_uint64_t attrib;
|
|
|
|
|
char name[72];
|
|
|
|
|
-} GRUB_PACKED;
|
|
|
|
|
+} GRUB_PACKED __attribute__ ((aligned(8)));
|
|
|
|
|
|
|
|
|
|
grub_err_t
|
|
|
|
|
grub_gpt_partition_map_iterate (grub_disk_t disk,
|
2020-07-29 20:47:36 +08:00
|
|
|
--
|
|
|
|
|
1.8.3.1
|
|
|
|
|
|
