diff options
-rw-r--r-- | drivers/mtd/ubi/ubi-media.h | 6 | ||||
-rw-r--r-- | include/mtd/ubi-user.h | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/drivers/mtd/ubi/ubi-media.h b/drivers/mtd/ubi/ubi-media.h index 503ea9b27309..6fb8ec2174a5 100644 --- a/drivers/mtd/ubi/ubi-media.h +++ b/drivers/mtd/ubi/ubi-media.h | |||
@@ -164,7 +164,7 @@ struct ubi_ec_hdr { | |||
164 | __be32 image_seq; | 164 | __be32 image_seq; |
165 | __u8 padding2[32]; | 165 | __u8 padding2[32]; |
166 | __be32 hdr_crc; | 166 | __be32 hdr_crc; |
167 | } __attribute__ ((packed)); | 167 | } __packed; |
168 | 168 | ||
169 | /** | 169 | /** |
170 | * struct ubi_vid_hdr - on-flash UBI volume identifier header. | 170 | * struct ubi_vid_hdr - on-flash UBI volume identifier header. |
@@ -292,7 +292,7 @@ struct ubi_vid_hdr { | |||
292 | __be64 sqnum; | 292 | __be64 sqnum; |
293 | __u8 padding3[12]; | 293 | __u8 padding3[12]; |
294 | __be32 hdr_crc; | 294 | __be32 hdr_crc; |
295 | } __attribute__ ((packed)); | 295 | } __packed; |
296 | 296 | ||
297 | /* Internal UBI volumes count */ | 297 | /* Internal UBI volumes count */ |
298 | #define UBI_INT_VOL_COUNT 1 | 298 | #define UBI_INT_VOL_COUNT 1 |
@@ -373,6 +373,6 @@ struct ubi_vtbl_record { | |||
373 | __u8 flags; | 373 | __u8 flags; |
374 | __u8 padding[23]; | 374 | __u8 padding[23]; |
375 | __be32 crc; | 375 | __be32 crc; |
376 | } __attribute__ ((packed)); | 376 | } __packed; |
377 | 377 | ||
378 | #endif /* !__UBI_MEDIA_H__ */ | 378 | #endif /* !__UBI_MEDIA_H__ */ |
diff --git a/include/mtd/ubi-user.h b/include/mtd/ubi-user.h index e70bd347dbbb..a3903423c005 100644 --- a/include/mtd/ubi-user.h +++ b/include/mtd/ubi-user.h | |||
@@ -310,7 +310,7 @@ struct ubi_mkvol_req { | |||
310 | __s16 name_len; | 310 | __s16 name_len; |
311 | __s8 padding2[4]; | 311 | __s8 padding2[4]; |
312 | char name[UBI_MAX_VOLUME_NAME + 1]; | 312 | char name[UBI_MAX_VOLUME_NAME + 1]; |
313 | } __attribute__ ((packed)); | 313 | } __packed; |
314 | 314 | ||
315 | /** | 315 | /** |
316 | * struct ubi_rsvol_req - a data structure used in volume re-size requests. | 316 | * struct ubi_rsvol_req - a data structure used in volume re-size requests. |
@@ -326,7 +326,7 @@ struct ubi_mkvol_req { | |||
326 | struct ubi_rsvol_req { | 326 | struct ubi_rsvol_req { |
327 | __s64 bytes; | 327 | __s64 bytes; |
328 | __s32 vol_id; | 328 | __s32 vol_id; |
329 | } __attribute__ ((packed)); | 329 | } __packed; |
330 | 330 | ||
331 | /** | 331 | /** |
332 | * struct ubi_rnvol_req - volumes re-name request. | 332 | * struct ubi_rnvol_req - volumes re-name request. |
@@ -368,7 +368,7 @@ struct ubi_rnvol_req { | |||
368 | __s8 padding2[2]; | 368 | __s8 padding2[2]; |
369 | char name[UBI_MAX_VOLUME_NAME + 1]; | 369 | char name[UBI_MAX_VOLUME_NAME + 1]; |
370 | } ents[UBI_MAX_RNVOL]; | 370 | } ents[UBI_MAX_RNVOL]; |
371 | } __attribute__ ((packed)); | 371 | } __packed; |
372 | 372 | ||
373 | /** | 373 | /** |
374 | * struct ubi_leb_change_req - a data structure used in atomic LEB change | 374 | * struct ubi_leb_change_req - a data structure used in atomic LEB change |
@@ -383,7 +383,7 @@ struct ubi_leb_change_req { | |||
383 | __s32 bytes; | 383 | __s32 bytes; |
384 | __s8 dtype; | 384 | __s8 dtype; |
385 | __s8 padding[7]; | 385 | __s8 padding[7]; |
386 | } __attribute__ ((packed)); | 386 | } __packed; |
387 | 387 | ||
388 | /** | 388 | /** |
389 | * struct ubi_map_req - a data structure used in map LEB requests. | 389 | * struct ubi_map_req - a data structure used in map LEB requests. |
@@ -395,7 +395,7 @@ struct ubi_map_req { | |||
395 | __s32 lnum; | 395 | __s32 lnum; |
396 | __s8 dtype; | 396 | __s8 dtype; |
397 | __s8 padding[3]; | 397 | __s8 padding[3]; |
398 | } __attribute__ ((packed)); | 398 | } __packed; |
399 | 399 | ||
400 | 400 | ||
401 | /** | 401 | /** |
@@ -409,6 +409,6 @@ struct ubi_set_vol_prop_req { | |||
409 | __u8 property; | 409 | __u8 property; |
410 | __u8 padding[7]; | 410 | __u8 padding[7]; |
411 | __u64 value; | 411 | __u64 value; |
412 | } __attribute__ ((packed)); | 412 | } __packed; |
413 | 413 | ||
414 | #endif /* __UBI_USER_H__ */ | 414 | #endif /* __UBI_USER_H__ */ |