History

Merge branch 'akpm' (patches from Andrew)

Merge more updates from Andrew Morton: "190 patches. Subsystems affected by this patch series: mm (hugetlb, userfaultfd, vmscan, kconfig, proc, z3fold, zbud, ras, mempolicy, memblock, migration, thp, nommu, kconfig, madvise, memory-hotplug, zswap, zsmalloc, zram, cleanups, kfence, and hmm), procfs, sysctl, misc, core-kernel, lib, lz4, checkpatch, init, kprobes, nilfs2, hfs, signals, exec, kcov, selftests, compress/decompress, and ipc" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (190 commits) ipc/util.c: use binary search for max_idx ipc/sem.c: use READ_ONCE()/WRITE_ONCE() for use_global_lock ipc: use kmalloc for msg_queue and shmid_kernel ipc sem: use kvmalloc for sem_undo allocation lib/decompressors: remove set but not used variabled 'level' selftests/vm/pkeys: exercise x86 XSAVE init state selftests/vm/pkeys: refill shadow register after implicit kernel write selftests/vm/pkeys: handle negative sys_pkey_alloc() return code selftests/vm/pkeys: fix alloc_random_pkey() to make it really, really random kcov: add __no_sanitize_coverage to fix noinstr for all architectures exec: remove checks in __register_bimfmt() x86: signal: don't do sas_ss_reset() until we are certain that sigframe won't be abandoned hfsplus: report create_date to kstat.btime hfsplus: remove unnecessary oom message nilfs2: remove redundant continue statement in a while-loop kprobes: remove duplicated strong free_insn_page in x86 and s390 init: print out unknown kernel parameters checkpatch: do not complain about positive return values starting with EPOLL checkpatch: improve the indented label test checkpatch: scripts/spdxcheck.py now requires python3 ...

Linus Torvalds committed 5 years ago

Commit 71bd9342 parents 3dbdb38 b869d5b299 files · +5991 −2961Browse files

Showing the changes to include/uapi/linux (2 of 299 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/mempolicy.h +0 −1
  2. include/uapi/linux/userfaultfd.h +6 −1
include/uapi/linux/mempolicy.h+0−1
@@ -60,7 +60,6 @@ enum { · 59 unmodified lines
6060 * are never OR'ed into the mode in mempolicy API arguments.
6161 */
6262 #define MPOL_F_SHARED (1 << 0) /* identify shared policies */
63−#define MPOL_F_LOCAL (1 << 1) /* preferred local allocation */
6463 #define MPOL_F_MOF (1 << 3) /* this policy wants migrate on fault */
6564 #define MPOL_F_MORON (1 << 4) /* Migrate On protnone Reference On Node */
6665
include/uapi/linux/userfaultfd.h+6−1
@@ -31,7 +31,8 @@ · 30 unmodified lines
3131 UFFD_FEATURE_MISSING_SHMEM | \
3232 UFFD_FEATURE_SIGBUS | \
3333 UFFD_FEATURE_THREAD_ID | \
34− UFFD_FEATURE_MINOR_HUGETLBFS)
34+ UFFD_FEATURE_MINOR_HUGETLBFS | \
35+ UFFD_FEATURE_MINOR_SHMEM)
3536 #define UFFD_API_IOCTLS \
3637 ((__u64)1 << _UFFDIO_REGISTER | \
3738 (__u64)1 << _UFFDIO_UNREGISTER | \
@@ -185,6 +186,9 @@ struct uffdio_api { · 147 unmodified lines
185186 * UFFD_FEATURE_MINOR_HUGETLBFS indicates that minor faults
186187 * can be intercepted (via REGISTER_MODE_MINOR) for
187188 * hugetlbfs-backed pages.
189+ *
190+ * UFFD_FEATURE_MINOR_SHMEM indicates the same support as
191+ * UFFD_FEATURE_MINOR_HUGETLBFS, but for shmem-backed pages instead.
188192 */
189193 #define UFFD_FEATURE_PAGEFAULT_FLAG_WP (1<<0)
190194 #define UFFD_FEATURE_EVENT_FORK (1<<1)
@@ -196,6 +200,7 @@ struct uffdio_api { · 5 unmodified lines
196200 #define UFFD_FEATURE_SIGBUS (1<<7)
197201 #define UFFD_FEATURE_THREAD_ID (1<<8)
198202 #define UFFD_FEATURE_MINOR_HUGETLBFS (1<<9)
203+#define UFFD_FEATURE_MINOR_SHMEM (1<<10)
199204 __u64 features;
200205
201206 __u64 ioctls;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t