Merge second patch-bomb from Andrew Morton: - misc fixes - audit stuff - fanotify/inotify/dnotify things - most of the rest of MM. The new cache shrinker code from Glauber and Dave Chinner probably isn't quite stabilized yet. - ptrace - ipc - partitions - reboot cleanups - add LZ4 decompressor, use it for kernel compression * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (118 commits) lib/scatterlist: error handling in __sg_alloc_table() scsi_debug: fix do_device_access() with wrap around range crypto: talitos: use sg_pcopy_to_buffer() lib/scatterlist: introduce sg_pcopy_from_buffer() and sg_pcopy_to_buffer() lib/scatterlist: factor out sg_miter_get_next_page() from sg_miter_next() crypto: add lz4 Cryptographic API lib: add lz4 compressor module arm: add support for LZ4-compressed kernel lib: add support for LZ4-compressed kernel decompressor: add LZ4 decompressor module lib: add weak clz/ctz functions reboot: move arch/x86 reboot= handling to generic kernel reboot: arm: change reboot_mode to use enum reboot_mode reboot: arm: prepare reboot_mode for moving to generic kernel code reboot: arm: remove unused restart_mode fields from some arm subarchs reboot: unicore32: prepare reboot_mode for moving to generic kernel code reboot: x86: prepare reboot_mode for moving to generic kernel code reboot: checkpatch.pl the new kernel/reboot.c file reboot: move shutdown/reboot related functions to kernel/reboot.c reboot: remove -stable friendly PF_THREAD_BOUND define ...
Showing the changes to include/uapi/linux (1 of 238 files). Show all
Unified · Split
| @@ -104,6 +104,8 @@ struct __fat_dirent { · 103 unmodified lines | ||
| 104 | 104 | /* <linux/videotext.h> has used 0x72 ('r') in collision, so skip a few */ |
| 105 | 105 | #define FAT_IOCTL_GET_ATTRIBUTES _IOR('r', 0x10, __u32) |
| 106 | 106 | #define FAT_IOCTL_SET_ATTRIBUTES _IOW('r', 0x11, __u32) |
| 107 | +/*Android kernel has used 0x12, so we use 0x13*/ | |
| 108 | +#define FAT_IOCTL_GET_VOLUME_ID _IOR('r', 0x13, __u32) | |
| 107 | 109 | |
| 108 | 110 | struct fat_boot_sector { |
| 109 | 111 | __u8 ignored[3]; /* Boot strap short or near jump */ |
| @@ -128,6 +130,10 @@ struct fat_boot_sector { · 18 unmodified lines | ||
| 128 | 130 | __u8 drive_number; /* Physical drive number */ |
| 129 | 131 | __u8 state; /* undocumented, but used |
| 130 | 132 | for mount state. */ |
| 133 | + __u8 signature; /* extended boot signature */ | |
| 134 | + __u8 vol_id[4]; /* volume ID */ | |
| 135 | + __u8 vol_label[11]; /* volume label */ | |
| 136 | + __u8 fs_type[8]; /* file system type */ | |
| 131 | 137 | /* other fiealds are not added here */ |
| 132 | 138 | } fat16; |
| 133 | 139 | |
| @@ -147,6 +153,10 @@ struct fat_boot_sector { · 13 unmodified lines | ||
| 147 | 153 | __u8 drive_number; /* Physical drive number */ |
| 148 | 154 | __u8 state; /* undocumented, but used |
| 149 | 155 | for mount state. */ |
| 156 | + __u8 signature; /* extended boot signature */ | |
| 157 | + __u8 vol_id[4]; /* volume ID */ | |
| 158 | + __u8 vol_label[11]; /* volume label */ | |
| 159 | + __u8 fs_type[8]; /* file system type */ | |
| 150 | 160 | /* other fiealds are not added here */ |
| 151 | 161 | } fat32; |
| 152 | 162 | }; |