summaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/mkswap.c2
-rw-r--r--util-linux/volume_id/linux_raid.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c
index 949c71a..7e32d91 100644
--- a/util-linux/mkswap.c
+++ b/util-linux/mkswap.c
@@ -65,7 +65,7 @@ struct swap_header_v1 {
uint32_t padding[117]; /* 11..127 */
uint32_t badpages[1]; /* 128 */
/* total 129 32-bit words in 2nd kilobyte */
-};
+} FIX_ALIASING;
#define NWORDS 129
#define hdr ((struct swap_header_v1*)bb_common_bufsiz1)
diff --git a/util-linux/volume_id/linux_raid.c b/util-linux/volume_id/linux_raid.c
index d1bf0c3..e1c8636 100644
--- a/util-linux/volume_id/linux_raid.c
+++ b/util-linux/volume_id/linux_raid.c
@@ -44,6 +44,7 @@ struct mdp_super_block {
int FAST_FUNC volume_id_probe_linux_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size)
{
+ typedef uint32_t aliased_uint32_t FIX_ALIASING;
#define off ((uint64_t)0)
uint64_t sboff;
uint8_t uuid[16];
@@ -63,7 +64,7 @@ int FAST_FUNC volume_id_probe_linux_raid(struct volume_id *id /*,uint64_t off*/,
if (mdp->md_magic != cpu_to_le32(MD_MAGIC))
return -1;
- *(uint32_t*)uuid = mdp->set_uuid0;
+ *(aliased_uint32_t*)uuid = mdp->set_uuid0;
memcpy(&uuid[4], &mdp->set_uuid1, 12);
volume_id_set_uuid(id, uuid, UUID_DCE);