Mercurial > hg > aboriginal

annotate sources/patches/linux-fixubi.patch @ 1458:60f1087591ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add ability to specify a package to rebuild to build.sh with REBUILD= (and then dependencies take it from there to the system image).
author Rob Landley <rob@landley.net>
date Thu, 20 Oct 2011 02:02:10 -0500
parents 14739f3ae2a5
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1426
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
1 Revert commit 3627924acf70a9a for details see
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
2 http://lkml.indiana.edu/hypermail/linux/kernel/1108.1/02863.html
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
3
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
4 diff --git a/drivers/mtd/ubi/ubi-media.h b/drivers/mtd/ubi/ubi-media.h
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
5 index 6fb8ec2..503ea9b 100644
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
6 --- a/drivers/mtd/ubi/ubi-media.h
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
7 +++ b/drivers/mtd/ubi/ubi-media.h
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
8 @@ -164,7 +164,7 @@ struct ubi_ec_hdr {
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
9 __be32 image_seq;
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
10 __u8 padding2[32];
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
11 __be32 hdr_crc;
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
12 -} __packed;
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
13 +} __attribute__ ((packed));
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
14
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
15 /**
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
16 * struct ubi_vid_hdr - on-flash UBI volume identifier header.
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
17 @@ -292,7 +292,7 @@ struct ubi_vid_hdr {
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
18 __be64 sqnum;
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
19 __u8 padding3[12];
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
20 __be32 hdr_crc;
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
21 -} __packed;
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
22 +} __attribute__ ((packed));
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
23
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
24 /* Internal UBI volumes count */
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
25 #define UBI_INT_VOL_COUNT 1
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
26 @@ -373,6 +373,6 @@ struct ubi_vtbl_record {
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
27 __u8 flags;
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
28 __u8 padding[23];
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
29 __be32 crc;
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
30 -} __packed;
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
31 +} __attribute__ ((packed));
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
32
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
33 #endif /* !__UBI_MEDIA_H__ */
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
34 diff --git a/include/mtd/ubi-user.h b/include/mtd/ubi-user.h
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
35 index a390342..e70bd34 100644
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
36 --- a/include/mtd/ubi-user.h
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
37 +++ b/include/mtd/ubi-user.h
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
38 @@ -310,7 +310,7 @@ struct ubi_mkvol_req {
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
39 __s16 name_len;
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
40 __s8 padding2[4];
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
41 char name[UBI_MAX_VOLUME_NAME + 1];
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
42 -} __packed;
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
43 +} __attribute__ ((packed));
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
44
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
45 /**
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
46 * struct ubi_rsvol_req - a data structure used in volume re-size requests.
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
47 @@ -326,7 +326,7 @@ struct ubi_mkvol_req {
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
48 struct ubi_rsvol_req {
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
49 __s64 bytes;
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
50 __s32 vol_id;
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
51 -} __packed;
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
52 +} __attribute__ ((packed));
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
53
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
54 /**
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
55 * struct ubi_rnvol_req - volumes re-name request.
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
56 @@ -368,7 +368,7 @@ struct ubi_rnvol_req {
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
57 __s8 padding2[2];
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
58 char name[UBI_MAX_VOLUME_NAME + 1];
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
59 } ents[UBI_MAX_RNVOL];
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
60 -} __packed;
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
61 +} __attribute__ ((packed));
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
62
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
63 /**
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
64 * struct ubi_leb_change_req - a data structure used in atomic LEB change
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
65 @@ -383,7 +383,7 @@ struct ubi_leb_change_req {
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
66 __s32 bytes;
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
67 __s8 dtype;
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
68 __s8 padding[7];
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
69 -} __packed;
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
70 +} __attribute__ ((packed));
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
71
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
72 /**
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
73 * struct ubi_map_req - a data structure used in map LEB requests.
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
74 @@ -395,7 +395,7 @@ struct ubi_map_req {
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
75 __s32 lnum;
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
76 __s8 dtype;
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
77 __s8 padding[3];
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
78 -} __packed;
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
79 +} __attribute__ ((packed));
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
80
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
81
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
82 /**
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
83 @@ -409,6 +409,6 @@ struct ubi_set_vol_prop_req {
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
84 __u8 property;
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
85 __u8 padding[7];
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
86 __u64 value;
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
87 -} __packed;
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
88 +} __attribute__ ((packed));
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
89
14739f3ae2a5 Busybox 1.19.0 and two patches to make it work.
Rob Landley <rob@landley.net>
parents:
diff changeset
90 #endif /* __UBI_USER_H__ */