Merge more updates from Andrew Morton: - most of the rest of MM - a small number of misc things - lib/ updates - checkpatch - autofs updates - ipc/ updates * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (126 commits) ipc: optimize semget/shmget/msgget for lots of keys ipc/sem: play nicer with large nsops allocations ipc/sem: drop sem_checkid helper ipc: convert kern_ipc_perm.refcount from atomic_t to refcount_t ipc: convert sem_undo_list.refcnt from atomic_t to refcount_t ipc: convert ipc_namespace.count from atomic_t to refcount_t kcov: support compat processes sh: defconfig: cleanup from old Kconfig options mn10300: defconfig: cleanup from old Kconfig options m32r: defconfig: cleanup from old Kconfig options drivers/pps: use surrounding "if PPS" to remove numerous dependency checks drivers/pps: aesthetic tweaks to PPS-related content cpumask: make cpumask_next() out-of-line kmod: move #ifdef CONFIG_MODULES wrapper to Makefile kmod: split off umh headers into its own file MAINTAINERS: clarify kmod is just a kernel module loader kmod: split out umh code into its own file test_kmod: flip INT checks to be consistent test_kmod: remove paranoid UINT_MAX check on uint range processing vfat: deduplicate hex2bin() ...
Showing the changes to include/uapi/linux (3 of 271 files). Show all
Unified · Split
| @@ -16,7 +16,7 @@ · 15 unmodified lines | ||
| 16 | 16 | #define AUTOFS_DEVICE_NAME "autofs" |
| 17 | 17 | |
| 18 | 18 | #define AUTOFS_DEV_IOCTL_VERSION_MAJOR 1 |
| 19 | −#define AUTOFS_DEV_IOCTL_VERSION_MINOR 0 | |
| 19 | +#define AUTOFS_DEV_IOCTL_VERSION_MINOR 1 | |
| 20 | 20 | |
| 21 | 21 | #define AUTOFS_DEV_IOCTL_SIZE sizeof(struct autofs_dev_ioctl) |
| 22 | 22 | |
| @@ -155,8 +155,6 @@ enum { · 154 unmodified lines | ||
| 155 | 155 | }; |
| 156 | 156 | |
| 157 | 157 | #define AUTOFS_IOC_EXPIRE_MULTI _IOW(AUTOFS_IOCTL, AUTOFS_IOC_EXPIRE_MULTI_CMD, int) |
| 158 | −#define AUTOFS_IOC_EXPIRE_INDIRECT AUTOFS_IOC_EXPIRE_MULTI | |
| 159 | −#define AUTOFS_IOC_EXPIRE_DIRECT AUTOFS_IOC_EXPIRE_MULTI | |
| 160 | 158 | #define AUTOFS_IOC_PROTOSUBVER _IOR(AUTOFS_IOCTL, AUTOFS_IOC_PROTOSUBVER_CMD, int) |
| 161 | 159 | #define AUTOFS_IOC_ASKUMOUNT _IOR(AUTOFS_IOCTL, AUTOFS_IOC_ASKUMOUNT_CMD, int) |
| 162 | 160 | |
| @@ -95,8 +95,8 @@ struct pps_kparams { · 94 unmodified lines | ||
| 95 | 95 | #define PPS_CAPTURECLEAR 0x02 /* capture clear events */ |
| 96 | 96 | #define PPS_CAPTUREBOTH 0x03 /* capture assert and clear events */ |
| 97 | 97 | |
| 98 | −#define PPS_OFFSETASSERT 0x10 /* apply compensation for assert ev. */ | |
| 99 | −#define PPS_OFFSETCLEAR 0x20 /* apply compensation for clear ev. */ | |
| 98 | +#define PPS_OFFSETASSERT 0x10 /* apply compensation for assert event */ | |
| 99 | +#define PPS_OFFSETCLEAR 0x20 /* apply compensation for clear event */ | |
| 100 | 100 | |
| 101 | 101 | #define PPS_CANWAIT 0x100 /* can we wait for an event? */ |
| 102 | 102 | #define PPS_CANPOLL 0x200 /* bit reserved for future use */ |