Pull ubi fixes from Artem Bityutskiy: "A couple of fixes and clean-ups, allow for assigning user-defined UBI device numbers when attaching MTD devices by using the "mtd=" module parameter" * tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubi: UBI: support ubi_num on mtd.ubi command line UBI: fastmap break out of used PEB search UBI: document UBI_IOCVOLUP better in user header UBI: do not abort init when ubi.mtd devices cannot be found UBI: drop redundant "UBI error" string
Showing the changes to include/uapi (1 of 3 files). Show all
Unified · Split
| @@ -173,7 +173,10 @@ · 172 unmodified lines | |||
| 173 | 173 | ||
| 174 | #define UBI_VOL_IOC_MAGIC 'O' | 174 | #define UBI_VOL_IOC_MAGIC 'O' |
| 175 | 175 | ||
| 176 | /* Start UBI volume update */ | 176 | /* Start UBI volume update |
| 177 | * Note: This actually takes a pointer (__s64*), but we can't change | ||
| 178 | * that without breaking the ABI on 32bit systems | ||
| 179 | */ | ||
| 177 | #define UBI_IOCVOLUP _IOW(UBI_VOL_IOC_MAGIC, 0, __s64) | 180 | #define UBI_IOCVOLUP _IOW(UBI_VOL_IOC_MAGIC, 0, __s64) |
| 178 | /* LEB erasure command, used for debugging, disabled by default */ | 181 | /* LEB erasure command, used for debugging, disabled by default */ |
| 179 | #define UBI_IOCEBER _IOW(UBI_VOL_IOC_MAGIC, 1, __s32) | 182 | #define UBI_IOCEBER _IOW(UBI_VOL_IOC_MAGIC, 1, __s32) |