Merge more incoming from Andrew Morton: "Two new syscalls: memfd_create in "shm: add memfd_create() syscall" kexec_file_load in "kexec: implementation of new syscall kexec_file_load" And: - Most (all?) of the rest of MM - Lots of the usual misc bits - fs/autofs4 - drivers/rtc - fs/nilfs - procfs - fork.c, exec.c - more in lib/ - rapidio - Janitorial work in filesystems: fs/ufs, fs/reiserfs, fs/adfs, fs/cramfs, fs/romfs, fs/qnx6. - initrd/initramfs work - "file sealing" and the memfd_create() syscall, in tmpfs - add pci_zalloc_consistent, use it in lots of places - MAINTAINERS maintenance - kexec feature work" * emailed patches from Andrew Morton <akpm@linux-foundation.org: (193 commits) MAINTAINERS: update nomadik patterns MAINTAINERS: update usb/gadget patterns MAINTAINERS: update DMA BUFFER SHARING patterns kexec: verify the signature of signed PE bzImage kexec: support kexec/kdump on EFI systems kexec: support for kexec on panic using new system call kexec-bzImage64: support for loading bzImage using 64bit entry kexec: load and relocate purgatory at kernel load time purgatory: core purgatory functionality purgatory/sha256: provide implementation of sha256 in purgaotory context kexec: implementation of new syscall kexec_file_load kexec: new syscall kexec_file_load() declaration kexec: make kexec_segment user buffer pointer a union resource: provide new functions to walk through resources kexec: use common function for kimage_normal_alloc() and kimage_crash_alloc() kexec: move segment verification code in a separate function kexec: rename unusebale_pages to unusable_pages kernel: build bin2c based on config option CONFIG_BUILD_BIN2C bin2c: move bin2c in scripts/basic shm: wait for pins to be released when sealing ...
Showing the changes to include/uapi (3 of 348 files). Show all
Unified · Split
| @@ -27,6 +27,21 @@ · 26 unmodified lines | ||
| 27 | 27 | #define F_SETPIPE_SZ (F_LINUX_SPECIFIC_BASE + 7) |
| 28 | 28 | #define F_GETPIPE_SZ (F_LINUX_SPECIFIC_BASE + 8) |
| 29 | 29 | |
| 30 | +/* | |
| 31 | + * Set/Get seals | |
| 32 | + */ | |
| 33 | +#define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9) | |
| 34 | +#define F_GET_SEALS (F_LINUX_SPECIFIC_BASE + 10) | |
| 35 | + | |
| 36 | +/* | |
| 37 | + * Types of seals | |
| 38 | + */ | |
| 39 | +#define F_SEAL_SEAL 0x0001 /* prevent further seals from being set */ | |
| 40 | +#define F_SEAL_SHRINK 0x0002 /* prevent file from shrinking */ | |
| 41 | +#define F_SEAL_GROW 0x0004 /* prevent file from growing */ | |
| 42 | +#define F_SEAL_WRITE 0x0008 /* prevent writes */ | |
| 43 | +/* (1U << 31) is reserved for signed error codes */ | |
| 44 | + | |
| 30 | 45 | /* |
| 31 | 46 | * Types of directory notifications that may be requested. |
| 32 | 47 | */ |
| @@ -13,6 +13,17 @@ · 12 unmodified lines | ||
| 13 | 13 | #define KEXEC_PRESERVE_CONTEXT 0x00000002 |
| 14 | 14 | #define KEXEC_ARCH_MASK 0xffff0000 |
| 15 | 15 | |
| 16 | +/* | |
| 17 | + * Kexec file load interface flags. | |
| 18 | + * KEXEC_FILE_UNLOAD : Unload already loaded kexec/kdump image. | |
| 19 | + * KEXEC_FILE_ON_CRASH : Load/unload operation belongs to kdump image. | |
| 20 | + * KEXEC_FILE_NO_INITRAMFS : No initramfs is being loaded. Ignore the initrd | |
| 21 | + * fd field. | |
| 22 | + */ | |
| 23 | +#define KEXEC_FILE_UNLOAD 0x00000001 | |
| 24 | +#define KEXEC_FILE_ON_CRASH 0x00000002 | |
| 25 | +#define KEXEC_FILE_NO_INITRAMFS 0x00000004 | |
| 26 | + | |
| 16 | 27 | /* These values match the ELF architecture values. |
| 17 | 28 | * Unless there is a good reason that should continue to be the case. |
| 18 | 29 | */ |
| @@ -0,0 +1,8 @@ | ||
| 1 | +#ifndef _UAPI_LINUX_MEMFD_H | |
| 2 | +#define _UAPI_LINUX_MEMFD_H | |
| 3 | + | |
| 4 | +/* flags for memfd_create(2) (unsigned int) */ | |
| 5 | +#define MFD_CLOEXEC 0x0001U | |
| 6 | +#define MFD_ALLOW_SEALING 0x0002U | |
| 7 | + | |
| 8 | +#endif /* _UAPI_LINUX_MEMFD_H */ | |